Merge "Action::checkCanExecute doesn't return anything on success, but WatchAction...

[lhc/web/wiklou.git] / includes / media / DjVu.php

diff --git a/includes/media/DjVu.php b/includes/media/DjVu.php
index f669029..2f960d9 100644 (file)
--- a/includes/media/DjVu.php
+++ b/includes/media/DjVu.php
@@ -5,7 +5,7 @@
  * @file
  * @ingroup Media
  */
- 
+
 /**
  * Handler for DjVu images
  *
@@ -120,7 +120,9 @@ class DjVuHandler extends ImageHandler {
                // normaliseParams will inevitably give.
                $xml = $image->getMetadata();
                if ( !$xml ) {
-                       return new MediaTransformError( 'thumbnail_error', @$params['width'], @$params['height'],
+                       $width = isset( $params['width'] ) ? $params['width'] : 0;
+                       $height = isset( $params['height'] ) ? $params['height'] : 0;
+                       return new MediaTransformError( 'thumbnail_error', $width, $height,
                                wfMsg( 'djvu_no_xml' ) );
                }
 
@@ -129,7 +131,7 @@ class DjVuHandler extends ImageHandler {
                }
                $width = $params['width'];
                $height = $params['height'];
-               $srcPath = $image->getPath();
+               $srcPath = $image->getLocalRefPath();
                $page = $params['page'];
                if ( $page > $this->pageCount( $image ) ) {
                        return new MediaTransformError( 'thumbnail_error', $width, $height, wfMsg( 'djvu_page_error' ) );
@@ -139,13 +141,14 @@ class DjVuHandler extends ImageHandler {
                        return new ThumbnailImage( $image, $dstUrl, $width, $height, $dstPath, $page );
                }
 
-               if ( !wfMkdirParents( dirname( $dstPath ) ) ) {
+               if ( !wfMkdirParents( dirname( $dstPath ), null, __METHOD__ ) ) {
                        return new MediaTransformError( 'thumbnail_error', $width, $height, wfMsg( 'thumbnail_dest_directory' ) );
                }
 
                # 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} " .
+               $cmd = '(' . wfEscapeShellArg( $wgDjvuRenderer ) . " -format=ppm -page={$page}" .
+                       " -size={$params['physicalWidth']}x{$params['physicalHeight']} " .
                        wfEscapeShellArg( $srcPath );
                if ( $wgDjvuPostProcessor ) {
                        $cmd .= " | {$wgDjvuPostProcessor}";
@@ -187,6 +190,8 @@ class DjVuHandler extends ImageHandler {
        /**
         * Cache a document tree for the DjVu XML metadata
         * @param $image File
+        * @param $gettext Boolean: DOCUMENT (Default: false)
+        * @return bool
         */
        function getMetaTree( $image , $gettext = false ) {
                if ( isset( $image->dejaMetaTree ) ) {
@@ -207,11 +212,11 @@ class DjVuHandler extends ImageHandler {
                        $image->djvuTextTree = false;
                        $tree = new SimpleXMLElement( $metadata );
                        if( $tree->getName() == 'mw-djvu' ) {
-                               foreach($tree->children() as $b){ 
+                               foreach($tree->children() as $b){
                                        if( $b->getName() == 'DjVuTxt' ) {
                                                $image->djvuTextTree = $b;
                                        }
-                                       else if ( $b->getName() == 'DjVuXML' ) {
+                                       elseif ( $b->getName() == 'DjVuXML' ) {
                                                $image->dejaMetaTree = $b;
                                        }
                                }
@@ -219,7 +224,7 @@ class DjVuHandler extends ImageHandler {
                                $image->dejaMetaTree = $tree;
                        }
                } catch( Exception $e ) {
-                       wfDebug( "Bogus multipage XML metadata on '$image->name'\n" );
+                       wfDebug( "Bogus multipage XML metadata on '{$image->getName()}'\n" );
                }
                wfRestoreWarnings();
                wfProfileOut( __METHOD__ );