Passed -size hint to convert, as recommended in the convert manpage. This gives a...

diff --git a/includes/Image.php b/includes/Image.php
index 674ce74..87f2744 100644 (file)
--- a/includes/Image.php
+++ b/includes/Image.php
@@ -1022,8 +1022,8 @@ class Image
                        # Specify white background color, will be used for transparent images
                        # in Internet Explorer/Windows instead of default black.
                        $cmd  =  $wgImageMagickConvertCommand .
-                               " -quality 85 -background white -geometry {$width} ".
-                               wfEscapeShellArg($this->imagePath) . " " .
+                               " -quality 85 -background white -size {$width}x{$height} ".
+                               wfEscapeShellArg($this->imagePath) . " -resize {$width}x{$height} " .
                                wfEscapeShellArg($thumbPath);                           
                        wfDebug("reallyRenderThumb: running ImageMagick: $cmd");
                        $conv = shell_exec( $cmd );