From 370e83bb0dfd0c70de268c93bf07ad5ee0897192 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Fri, 15 Aug 2008 01:29:47 +0200 Subject: Update auf 1.13.0 --- includes/media/DjVu.php | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'includes/media/DjVu.php') diff --git a/includes/media/DjVu.php b/includes/media/DjVu.php index 20e59d18..f0bbcc51 100644 --- a/includes/media/DjVu.php +++ b/includes/media/DjVu.php @@ -1,7 +1,11 @@ getMetadata(); if ( !$xml ) { - return new MediaTransformError( 'thumbnail_error', @$params['width'], @$params['height'], + return new MediaTransformError( 'thumbnail_error', @$params['width'], @$params['height'], wfMsg( 'djvu_no_xml' ) ); } - + if ( !$this->normaliseParams( $image, $params ) ) { return new TransformParameterError( $params ); } @@ -81,7 +85,7 @@ class DjVuHandler extends ImageHandler { if ( $page > $this->pageCount( $image ) ) { return new MediaTransformError( 'thumbnail_error', $width, $height, wfMsg( 'djvu_page_error' ) ); } - + if ( $flags & self::TRANSFORM_LATER ) { return new ThumbnailImage( $image, $dstUrl, $width, $height, $dstPath, $page ); } @@ -90,7 +94,7 @@ class DjVuHandler extends ImageHandler { return new MediaTransformError( 'thumbnail_error', $width, $height, wfMsg( 'thumbnail_dest_directory' ) ); } - # Use a subshell (brackets) to aggregate stderr from both pipeline commands + # Use a subshell (brackets) to aggregate stderr from both pipeline commands # before redirecting it to the overall stdout. This works in both Linux and Windows XP. $cmd = '(' . wfEscapeShellArg( $wgDjvuRenderer ) . " -format=ppm -page={$page} -size={$width}x{$height} " . wfEscapeShellArg( $srcPath ); @@ -208,5 +212,3 @@ class DjVuHandler extends ImageHandler { } } } - - -- cgit v1.2.2