Minor tweaks to r74232, add a value for $botMax on calls for integer validation ...

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

diff --git a/includes/media/SVG.php b/includes/media/SVG.php
index c06f889..242b264 100644 (file)
--- a/includes/media/SVG.php
+++ b/includes/media/SVG.php
@@ -1,7 +1,15 @@
 <?php
+/**
+ * Handler for SVG images.
+ *
+ * @file
+ * @ingroup Media
+ */
 
 /**
- * @addtogroup Media
+ * Handler for SVG images.
+ *
+ * @ingroup Media
  */
 class SvgHandler extends ImageHandler {
        function isEnabled() {
@@ -23,7 +31,6 @@ class SvgHandler extends ImageHandler {
                if ( !parent::normaliseParams( $image, $params ) ) {
                        return false;
                }
-
                # Don't make an image bigger than wgMaxSVGSize
                $params['physicalWidth'] = $params['width'];
                $params['physicalHeight'] = $params['height'];
@@ -37,8 +44,6 @@ class SvgHandler extends ImageHandler {
        }
 
        function doTransform( $image, $dstPath, $dstUrl, $params, $flags = 0 ) {
-               global $wgSVGConverters, $wgSVGConverter, $wgSVGConverterPath;
-
                if ( !$this->normaliseParams( $image, $params ) ) {
                        return new TransformParameterError( $params );
                }
@@ -56,45 +61,65 @@ class SvgHandler extends ImageHandler {
                        return new MediaTransformError( 'thumbnail_error', $clientWidth, $clientHeight,
                                wfMsg( 'thumbnail_dest_directory' ) );
                }
-
+               
+               $status = $this->rasterize( $srcPath, $dstPath, $physicalWidth, $physicalHeight );
+               if( $status === true ) {
+                       return new ThumbnailImage( $image, $dstUrl, $clientWidth, $clientHeight, $dstPath );
+               } else {
+                       return $status; // MediaTransformError
+               }
+       }
+       
+       /*
+       * Transform an SVG file to PNG
+       * This function can be called outside of thumbnail contexts
+       * @param string $srcPath
+       * @param string $dstPath
+       * @param string $width
+       * @param string $height
+       * @returns TRUE/MediaTransformError
+       */
+       public function rasterize( $srcPath, $dstPath, $width, $height ) {
+               global $wgSVGConverters, $wgSVGConverter, $wgSVGConverterPath;
                $err = false;
-               if( isset( $wgSVGConverters[$wgSVGConverter] ) ) {
+               $retval = '';
+               if ( isset( $wgSVGConverters[$wgSVGConverter] ) ) {
                        $cmd = str_replace(
                                array( '$path/', '$width', '$height', '$input', '$output' ),
                                array( $wgSVGConverterPath ? wfEscapeShellArg( "$wgSVGConverterPath/" ) : "",
-                                          intval( $physicalWidth ),
-                                          intval( $physicalHeight ),
+                                          intval( $width ),
+                                          intval( $height ),
                                           wfEscapeShellArg( $srcPath ),
                                           wfEscapeShellArg( $dstPath ) ),
-                               $wgSVGConverters[$wgSVGConverter] ) . " 2>&1";
+                               $wgSVGConverters[$wgSVGConverter]
+                       ) . " 2>&1";
                        wfProfileIn( 'rsvg' );
                        wfDebug( __METHOD__.": $cmd\n" );
                        $err = wfShellExec( $cmd, $retval );
                        wfProfileOut( 'rsvg' );
                }
-
                $removed = $this->removeBadFile( $dstPath, $retval );
                if ( $retval != 0 || $removed ) {
-                       wfDebugLog( 'thumbnail',
-                               sprintf( 'thumbnail failed on %s: error %d "%s" from "%s"',
+                       wfDebugLog( 'thumbnail', sprintf( 'thumbnail failed on %s: error %d "%s" from "%s"',
                                        wfHostname(), $retval, trim($err), $cmd ) );
-                       return new MediaTransformError( 'thumbnail_error', $clientWidth, $clientHeight, $err );
-               } else {
-                       return new ThumbnailImage( $image, $dstUrl, $clientWidth, $clientHeight, $dstPath );
+                       return new MediaTransformError( 'thumbnail_error', $width, $height, $err );
                }
+               return true;
        }
 
        function getImageSize( $image, $path ) {
                return wfGetSVGsize( $path );
        }
 
-       function getThumbType( $ext, $mime ) {
+       function getThumbType( $ext, $mime, $params = null ) {
                return array( 'png', 'image/png' );
        }
 
-       static function getLongDesc( $file ) {
+       function getLongDesc( $file ) {
                global $wgLang;
-               return wfMsg( 'svg-long-desc', $file->getWidth(), $file->getHeight(),
+               return wfMsgExt( 'svg-long-desc', 'parseinline',
+                       $wgLang->formatNum( $file->getWidth() ),
+                       $wgLang->formatNum( $file->getHeight() ),
                        $wgLang->formatSize( $file->getSize() ) );
        }
 }