wikimedia/mediawiki-extensions-PdfHandler
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/PdfHandler synced 2024-11-24 00:07:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't load extension messages until they're needed for error messages...

Browse source 
Direct GS and Convert errors to stdout so we can pick them up and report them
This commit is contained in:
Brion Vibber 2008-02-05 00:16:54 +00:00
parent cd7f5ea32c
commit fadc8e07fa
1 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
PdfHandler_body.php
View file

@ -79,20 +79,21 @@ class PdfHandler extends ImageHandler {
);
}
protected function doThumbError( $width, $height, $msg ) {
wfLoadExtensionMessages( 'PdfHandler' );
return new MediaTransformError( 'thumbnail_error',
$width, $height, wfMsgForContent( $msg ) );
}
function doTransform( $image, $dstPath, $dstUrl, $params, $flags = 0 ) {
global $wgPdfProcessor;
global $wgPdfPostProcessor;
global $wgPdfHandlerDpi;
wfLoadExtensionMessages( 'PdfHandler' );
$metadata = $image->getMetadata();
if ( !$metadata )
return new MediaTransformError( 'thumbnail_error',
@$params['width'],
@$params['height'],
wfMsg( 'pdf_no_metadata' ) );
return $this->doThumbError( @$params['width'], @$params['height'], 'pdf_no_metadata' );
if ( !$this->normaliseParams( $image, $params ) )
return new TransformParameterError( $params );
@ -103,20 +104,14 @@ class PdfHandler extends ImageHandler {
$page = $params['page'];
if ( $page > $this->pageCount( $image ) )
return new MediaTransformError( 'thumbnail_error',
$width,
$height,
wfMsg( 'pdf_page_error' ) );
return $this->doTHumbError( $width, $height, 'pdf_page_error' );
if ( $flags & self::TRANSFORM_LATER )
return new ThumbnailImage( $image, $dstUrl, $width,
$height, $dstPath, $page );
if ( !wfMkdirParents( dirname( $dstPath ) ) )
return new MediaTransformError( 'thumbnail_error',
$width,
$height,
wfMsg( 'thumbnail_dest_directory' ) );
return $this->doThumbError( $width, $height, 'thumbnail_dest_directory' );
$cmd = '(' . wfEscapeShellArg( $wgPdfProcessor );
$cmd .= " -sDEVICE=jpeg -sOutputFile=- -dFirstPage={$page} -dLastPage={$page}";
@ -124,6 +119,7 @@ class PdfHandler extends ImageHandler {
$cmd .= " | " . wfEscapeShellArg( $wgPdfPostProcessor );
$cmd .= " -depth 8 -resize {$width} - ";
$cmd .= wfEscapeShellArg( $dstPath ) . ")";
$cmd .= " 2>&1";
wfProfileIn( 'PdfHandler' );
wfDebug( __METHOD__.": $cmd\n" );