use ImageMagick -thumbnail option instead of -resize

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index f164ab8..32e1ab0 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -266,6 +266,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 7004) PHP iconv() notice on bad password input to Special:Userlogin.
 * (bug 6826) Extend pre-save transform context link ("pipe trick")
   syntax to pages with commas in title
+* Use ImageMagick -thumbnail option instead of -resize to avoid including
+  excessive metadata in thumbs (requires ImageMagick 5.5.8 or newer).
 
 
 == Languages updated ==

diff --git a/includes/Image.php b/includes/Image.php
index 0754f67..55e53e2 100644 (file)
--- a/includes/Image.php
+++ b/includes/Image.php
@@ -1211,7 +1211,7 @@ class Image
                                        // For the -resize option a "!" is needed to force exact size,
                                        // or ImageMagick may decide your ratio is wrong and slice off
                                        // a pixel.
-                                       " -resize " . wfEscapeShellArg( "{$width}x{$height}!" ) .
+                                       " -thumbnail " . wfEscapeShellArg( "{$width}x{$height}!" ) .
                                        " -depth 8 " .
                                        wfEscapeShellArg($thumbPath) . " 2>&1";
                                wfDebug("reallyRenderThumb: running ImageMagick: $cmd\n");