| Index: trunk/extensions/PagedTiffHandler/PagedTiffHandler_body.php |
| — | — | @@ -350,15 +350,14 @@ |
| 351 | 351 | if ( ( $pagesize['width'] > $width ) && ( $pagesize['height'] > $height ) ) { |
| 352 | 352 | $xfac = $pagesize['width'] / $width; |
| 353 | 353 | $yfac = $pagesize['height'] / $height; |
| 354 | | - // tested in Linux and Windows |
| 355 | 354 | $cmd = wfEscapeShellArg( $wgTiffVipsCommand ); |
| 356 | | - $cmd .= ' im_shrink "' . wfEscapeShellArg( $srcPath ) . ':' . ( $page - 1 ) . '" '; |
| | 355 | + $cmd .= ' im_shrink ' . wfEscapeShellArg( $srcPath . ':' . ( $page - 1 ) ) . ' '; |
| 357 | 356 | $cmd .= wfEscapeShellArg( $dstPath ); |
| 358 | 357 | $cmd .= " {$xfac} {$yfac} 2>&1"; |
| 359 | 358 | } else { |
| 360 | | - // tested in Linux and Windows |
| 361 | 359 | $cmd = wfEscapeShellArg( $wgTiffVipsCommand ); |
| 362 | | - $cmd .= ' im_resize_linear "' . wfEscapeShellArg( $srcPath ) . ':' . ( $page - 1 ) . '" '; |
| | 360 | + $cmd .= ' im_resize_linear ' . wfEscapeShellArg( $srcPath . ':' . |
| | 361 | + ( $page - 1 ) ) . ' '; |
| 363 | 362 | $cmd .= wfEscapeShellArg( $dstPath ); |
| 364 | 363 | $cmd .= " {$width} {$height} 2>&1"; |
| 365 | 364 | } |