From e8881b2a664663216815e563d3f10d2d81aeafde Mon Sep 17 00:00:00 2001 From: Bryan Tong Minh Date: Sun, 11 Apr 2010 13:59:01 +0000 Subject: [PATCH] Follow up r64935: Add whitespace and clarify comment a bit more. --- includes/media/Bitmap.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/includes/media/Bitmap.php b/includes/media/Bitmap.php index f9116442fb..1f390bbcce 100644 --- a/includes/media/Bitmap.php +++ b/includes/media/Bitmap.php @@ -149,19 +149,20 @@ class BitmapHandler extends ImageHandler { $cmd = $tempEnv . - wfEscapeShellArg($wgImageMagickConvertCommand) . + wfEscapeShellArg( $wgImageMagickConvertCommand ) . " {$quality} -background white -size {$physicalWidth} ". - wfEscapeShellArg($srcPath . $frame) . + wfEscapeShellArg( $srcPath . $frame ) . $animation . // For the -resize option a "!" is needed to force exact size, // or ImageMagick may decide your ratio is wrong and slice off // a pixel. " -thumbnail " . wfEscapeShellArg( "{$physicalWidth}x{$physicalHeight}!" ) . - // A % is an escape character in ImageMagick + // Add the source url as a comment to the thumb. A % is an + // escape character in ImageMagick, so needs escaping " -set comment " . wfEscapeShellArg( str_replace( '%', '%%', $descriptionUrl ) ) . " -depth 8 $sharpen " . - wfEscapeShellArg($dstPath) . " 2>&1"; - wfDebug( __METHOD__.": running ImageMagick: $cmd\n"); + wfEscapeShellArg( $dstPath ) . " 2>&1"; + wfDebug( __METHOD__.": running ImageMagick: $cmd\n" ); wfProfileIn( 'convert' ); $err = wfShellExec( $cmd, $retval ); wfProfileOut( 'convert' ); -- 2.20.1