Localisation updates for core from Betawiki

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

diff --git a/includes/media/Bitmap.php b/includes/media/Bitmap.php
index 375028a..39d70a6 100644 (file)
--- a/includes/media/Bitmap.php
+++ b/includes/media/Bitmap.php
@@ -1,7 +1,11 @@
 <?php
+/**
+ * @file
+ * @ingroup Media
+ */
 
 /**
- * @addtogroup Media
+ * @ingroup Media
  */
 class BitmapHandler extends ImageHandler {
        function normaliseParams( $image, &$params ) {
@@ -26,7 +30,7 @@ class BitmapHandler extends ImageHandler {
                # Don't make an image bigger than the source
                $params['physicalWidth'] = $params['width'];
                $params['physicalHeight'] = $params['height'];
-               
+
                if ( $params['physicalWidth'] >= $srcWidth ) {
                        $params['physicalWidth'] = $srcWidth;
                        $params['physicalHeight'] = $srcHeight;
@@ -35,7 +39,7 @@ class BitmapHandler extends ImageHandler {
 
                return true;
        }
-       
+
        function doTransform( $image, $dstPath, $dstUrl, $params, $flags = 0 ) {
                global $wgUseImageMagick, $wgImageMagickConvertCommand;
                global $wgCustomConvertCommand;
@@ -55,10 +59,10 @@ class BitmapHandler extends ImageHandler {
                $retval = 0;
                wfDebug( __METHOD__.": creating {$physicalWidth}x{$physicalHeight} thumbnail at $dstPath\n" );
 
-               if ( $physicalWidth == $srcWidth && $physicalHeight == $srcHeight ) {
+               if ( !$image->mustRender() && $physicalWidth == $srcWidth && $physicalHeight == $srcHeight ) {
                        # normaliseParams (or the user) wants us to return the unscaled image
                        wfDebug( __METHOD__.": returning unscaled image\n" );
-                       return new ThumbnailImage( $image->getURL(), $clientWidth, $clientHeight, $srcPath );
+                       return new ThumbnailImage( $image, $image->getURL(), $clientWidth, $clientHeight, $srcPath );
                }
 
                if ( !$dstPath ) {
@@ -77,16 +81,16 @@ class BitmapHandler extends ImageHandler {
                if ( $scaler == 'client' ) {
                        # Client-side image scaling, use the source URL
                        # Using the destination URL in a TRANSFORM_LATER request would be incorrect
-                       return new ThumbnailImage( $image->getURL(), $clientWidth, $clientHeight, $srcPath );
+                       return new ThumbnailImage( $image, $image->getURL(), $clientWidth, $clientHeight, $srcPath );
                }
 
                if ( $flags & self::TRANSFORM_LATER ) {
-                       return new ThumbnailImage( $dstUrl, $clientWidth, $clientHeight, $dstPath );
+                       return new ThumbnailImage( $image, $dstUrl, $clientWidth, $clientHeight, $dstPath );
                }
 
                if ( !wfMkdirParents( dirname( $dstPath ) ) ) {
-                       return new MediaTransformError( 'thumbnail_error', $clientWidth, $clientHeight, 
-                               wfMsg( 'thumbnail_dest_directory' ) );
+                       wfDebug( "Unable to create thumbnail destination directory, falling back to client scaling\n" );
+                       return new ThumbnailImage( $image, $image->getURL(), $clientWidth, $clientHeight, $srcPath );
                }
 
                if ( $scaler == 'im' ) {
@@ -157,7 +161,7 @@ class BitmapHandler extends ImageHandler {
                                wfDebug( "$err\n" );
                                return new MediaTransformError( 'thumbnail_error', $clientWidth, $clientHeight, $err );
                        }
-                       list( $loader, /* $colorStyle */, $saveType ) = $typemap[$mimeType];
+                       list( $loader, $colorStyle, $saveType ) = $typemap[$mimeType];
 
                        if( !function_exists( $loader ) ) {
                                $err = "Incomplete GD library configuration: missing function $loader";
@@ -167,9 +171,27 @@ class BitmapHandler extends ImageHandler {
 
                        $src_image = call_user_func( $loader, $srcPath );
                        $dst_image = imagecreatetruecolor( $physicalWidth, $physicalHeight );
-                       imagecopyresampled( $dst_image, $src_image,
-                                               0,0,0,0,
-                                               $physicalWidth, $physicalHeight, imagesx( $src_image ), imagesy( $src_image ) );
+
+                       // Initialise the destination image to transparent instead of
+                       // the default solid black, to support PNG and GIF transparency nicely
+                       $background = imagecolorallocate( $dst_image, 0, 0, 0 );
+                       imagecolortransparent( $dst_image, $background );
+                       imagealphablending( $dst_image, false );
+
+                       if( $colorStyle == 'palette' ) {
+                               // Don't resample for paletted GIF images.
+                               // It may just uglify them, and completely breaks transparency.
+                               imagecopyresized( $dst_image, $src_image,
+                                       0,0,0,0,
+                                       $physicalWidth, $physicalHeight, imagesx( $src_image ), imagesy( $src_image ) );
+                       } else {
+                               imagecopyresampled( $dst_image, $src_image,
+                                       0,0,0,0,
+                                       $physicalWidth, $physicalHeight, imagesx( $src_image ), imagesy( $src_image ) );
+                       }
+
+                       imagesavealpha( $dst_image, true );
+
                        call_user_func( $saveType, $dst_image, $dstPath );
                        imagedestroy( $dst_image );
                        imagedestroy( $src_image );
@@ -183,7 +205,7 @@ class BitmapHandler extends ImageHandler {
                                        wfHostname(), $retval, trim($err), $cmd ) );
                        return new MediaTransformError( 'thumbnail_error', $clientWidth, $clientHeight, $err );
                } else {
-                       return new ThumbnailImage( $dstUrl, $clientWidth, $clientHeight, $dstPath );
+                       return new ThumbnailImage( $image, $dstUrl, $clientWidth, $clientHeight, $dstPath );
                }
        }
 
@@ -274,16 +296,14 @@ class BitmapHandler extends ImageHandler {
                // Sort fields into visible and collapsed
                $visibleFields = $this->visibleMetadataFields();
                foreach ( $formatted as $name => $value ) {
-                       $tag = strtolower( $k );
+                       $tag = strtolower( $name );
                        self::addMeta( $result,
                                in_array( $tag, $visibleFields ) ? 'visible' : 'collapsed',
                                'exif',
-                               "exif-$tag",
+                               $tag,
                                $value
                        );
                }
                return $result;
        }
 }
-
-