Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bug 32874 - Bitmap.php uses -define in ImageMagick configuration line which requires ImageMagick 6.5.6-2 but doesn't do a version check

Browse source 
"Patch"/Idea provided by Christian Neubauer
This commit is contained in:
Sam Reed 2011-12-08 16:18:18 +00:00
parent c417cd932b
commit 16b878fdb6
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
includes/media/Bitmap.php
View file

@ -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