From: Brion Vibber <brion@users.mediawiki.org>
Date: Tue, 16 Dec 2008 21:56:44 +0000 (+0000)
Subject: Update $wgSVGConverters default command lines to send both width and height to ImageM... 
X-Git-Tag: 1.31.0-rc.0~43927
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=0e65bb7961d00be8d5614bb2f17558c310e5194b;p=lhc%2Fweb%2Fwiklou.git

Update $wgSVGConverters default command lines to send both width and height to ImageMagick convert
---

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index bb23559f8b..100c50a3f6 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -2023,7 +2023,7 @@ $wgCustomConvertCommand = false;
 #
 # An external program is required to perform this conversion:
 $wgSVGConverters = array(
-	'ImageMagick' => '$path/convert -background white -geometry $width $input PNG:$output',
+	'ImageMagick' => '$path/convert -background white -thumbnail $widthx$height\! $input PNG:$output',
 	'sodipodi' => '$path/sodipodi -z -w $width -f $input -e $output',
 	'inkscape' => '$path/inkscape -z -w $width -f $input -e $output',
 	'batik' => 'java -Djava.awt.headless=true -jar $path/batik-rasterizer.jar -w $width -d $output $input',