| Index: trunk/extensions/PagedTiffHandler/PagedTiffHandler.php |
| — | — | @@ -32,7 +32,7 @@ |
| 33 | 33 | $wgUseImageMagick = true; |
| 34 | 34 | $wgImageMagickConvertCommand = "C:\Program Files\ImageMagick-6.5.6-Q8\convert"; |
| 35 | 35 | $wgImageMagickIdentifyCommand = "C:\Program Files\ImageMagick-6.5.6-Q8\identify"; |
| 36 | | -$wgTiffExivCommand = "C:\Program Files\Exiv2\exiv2"; |
| | 36 | +$wgExiv2Command = "C:\Program Files\Exiv2\exiv2"; |
| 37 | 37 | $wgMaxUploadSize = 1073741824; |
| 38 | 38 | $wgShowEXIF = true; |
| 39 | 39 | */ |
| — | — | @@ -89,8 +89,6 @@ |
| 90 | 90 | |
| 91 | 91 | // Path to identify |
| 92 | 92 | $wgImageMagickIdentifyCommand = '/usr/bin/identify'; |
| 93 | | -// Path to exiv2 |
| 94 | | -$wgTiffExivCommand = '/usr/bin/exiv2'; |
| 95 | 93 | // Use exiv2? if false, MediaWiki's internal EXIF parser will be used |
| 96 | 94 | $wgTiffUseExiv = false; |
| 97 | 95 | //path to tiffinfo |
| Index: trunk/extensions/PagedTiffHandler/PagedTiffHandler.image.php |
| — | — | @@ -86,7 +86,7 @@ |
| 87 | 87 | * meta['warnings'] = identify-warnings |
| 88 | 88 | */ |
| 89 | 89 | public function retrieveMetaData() { |
| 90 | | - global $wgImageMagickIdentifyCommand, $wgTiffExivCommand, $wgTiffUseExiv; |
| | 90 | + global $wgImageMagickIdentifyCommand, $wgExiv2Command, $wgTiffUseExiv; |
| 91 | 91 | global $wgTiffUseTiffinfo, $wgTiffTiffinfoCommand; |
| 92 | 92 | global $wgShowEXIF; |
| 93 | 93 | |
| — | — | @@ -150,7 +150,7 @@ |
| 151 | 151 | // see exiv2-doc @link http://www.exiv2.org/sample.html |
| 152 | 152 | // NOTE: the linux version of exiv2 has a bug: it can only |
| 153 | 153 | // read one type of meta-data at a time, not all at once. |
| 154 | | - $cmd = wfEscapeShellArg( $wgTiffExivCommand ) . |
| | 154 | + $cmd = wfEscapeShellArg( $wgExiv2Command ) . |
| 155 | 155 | ' -u -psix -Pnt ' . wfEscapeShellArg( $this->mFilename ) . ' 2>&1'; |
| 156 | 156 | |
| 157 | 157 | wfProfileIn( 'exiv2' ); |