Bug 32874 - Bitmap.php uses -define in ImageMagick configuration line which requires...

"Patch"/Idea provided by Christian Neubauer

diff --git a/includes/media/Bitmap.php b/includes/media/Bitmap.php
index 2424888..76c3009 100644 (file)
--- 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