http://www.mediawiki.org/wiki/Special:Code/MediaWiki/90921
Revision: 90921
Author: neilk
Date: 2011-06-27 23:08:30 +0000 (Mon, 27 Jun 2011)
Log Message:
-----------
use new $wgExiv2Command global. Already defined in DefaultSettings so in
default/unix case, no need to redefine it.
Modified Paths:
--------------
trunk/extensions/PagedTiffHandler/PagedTiffHandler.image.php
trunk/extensions/PagedTiffHandler/PagedTiffHandler.php
Modified: trunk/extensions/PagedTiffHandler/PagedTiffHandler.image.php
===================================================================
--- trunk/extensions/PagedTiffHandler/PagedTiffHandler.image.php
2011-06-27 23:04:58 UTC (rev 90920)
+++ trunk/extensions/PagedTiffHandler/PagedTiffHandler.image.php
2011-06-27 23:08:30 UTC (rev 90921)
@@ -86,7 +86,7 @@
* meta['warnings'] = identify-warnings
*/
public function retrieveMetaData() {
- global $wgImageMagickIdentifyCommand, $wgTiffExivCommand,
$wgTiffUseExiv;
+ global $wgImageMagickIdentifyCommand, $wgExiv2Command,
$wgTiffUseExiv;
global $wgTiffUseTiffinfo, $wgTiffTiffinfoCommand;
global $wgShowEXIF;
@@ -150,7 +150,7 @@
// see exiv2-doc @link
http://www.exiv2.org/sample.html
// NOTE: the linux version of exiv2 has a bug:
it can only
// read one type of meta-data at a time, not
all at once.
- $cmd = wfEscapeShellArg( $wgTiffExivCommand ) .
+ $cmd = wfEscapeShellArg( $wgExiv2Command ) .
' -u -psix -Pnt ' . wfEscapeShellArg(
$this->mFilename ) . ' 2>&1';
wfProfileIn( 'exiv2' );
Modified: trunk/extensions/PagedTiffHandler/PagedTiffHandler.php
===================================================================
--- trunk/extensions/PagedTiffHandler/PagedTiffHandler.php 2011-06-27
23:04:58 UTC (rev 90920)
+++ trunk/extensions/PagedTiffHandler/PagedTiffHandler.php 2011-06-27
23:08:30 UTC (rev 90921)
@@ -32,7 +32,7 @@
$wgUseImageMagick = true;
$wgImageMagickConvertCommand = "C:\Program Files\ImageMagick-6.5.6-Q8\convert";
$wgImageMagickIdentifyCommand = "C:\Program
Files\ImageMagick-6.5.6-Q8\identify";
-$wgTiffExivCommand = "C:\Program Files\Exiv2\exiv2";
+$wgExiv2Command = "C:\Program Files\Exiv2\exiv2";
$wgMaxUploadSize = 1073741824;
$wgShowEXIF = true;
*/
@@ -89,8 +89,6 @@
// Path to identify
$wgImageMagickIdentifyCommand = '/usr/bin/identify';
-// Path to exiv2
-$wgTiffExivCommand = '/usr/bin/exiv2';
// Use exiv2? if false, MediaWiki's internal EXIF parser will be used
$wgTiffUseExiv = false;
//path to tiffinfo
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
