From: Sam Reed Date: Thu, 8 Dec 2011 16:18:18 +0000 (+0000) Subject: Bug 32874 - Bitmap.php uses -define in ImageMagick configuration line which requires... X-Git-Tag: 1.31.0-rc.0~26128 X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=16b878fdb6ded9d2d315b9c65537fa25dd13d6a9;p=lhc%2Fweb%2Fwiklou.git Bug 32874 - Bitmap.php uses -define in ImageMagick configuration line which requires ImageMagick 6.5.6-2 but doesn't do a version check "Patch"/Idea provided by Christian Neubauer --- diff --git a/includes/media/Bitmap.php b/includes/media/Bitmap.php index 2424888787..76c3009e9e 100644 --- a/includes/media/Bitmap.php +++ b/includes/media/Bitmap.php @@ -39,7 +39,6 @@ class BitmapHandler extends ImageHandler { return true; } } - # Check if the file is smaller than the maximum image area for thumbnailing $checkImageAreaHookResult = null; @@ -280,8 +279,10 @@ class BitmapHandler extends ImageHandler { < $wgSharpenReductionThreshold ) { $sharpen = "-sharpen " . wfEscapeShellArg( $wgSharpenParameter ); } - // JPEG decoder hint to reduce memory, available since IM 6.5.6-2 - $decoderHint = "-define jpeg:size={$params['physicalDimensions']}"; + if ( version_compare( $this->getMagickVersion(), "6.3.5" ) >= 0 ) { + // JPEG decoder hint to reduce memory, available since IM 6.5.6-2 + $decoderHint = "-define jpeg:size={$params['physicalDimensions']}"; + } } elseif ( $params['mimeType'] == 'image/png' ) { $quality = "-quality 95"; // zlib 9, adaptive filtering