From 16b878fdb6ded9d2d315b9c65537fa25dd13d6a9 Mon Sep 17 00:00:00 2001 From: Sam Reed Date: Thu, 8 Dec 2011 16:18:18 +0000 Subject: [PATCH] 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 --- includes/media/Bitmap.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 -- 2.20.1