jenkins-bot has submitted this change and it was merged.

Change subject: For xcf files, compose layers before scaling
......................................................................


For xcf files, compose layers before scaling

Otherwise if some layers are a different size than the overall
image, the output will be distorted as all the layers will be
resized.

An example of such a file is the 2007 version of
[[File:Blason_Saint-Malo.xcf]] (Need a version of image magick
newer than production to see the issue).

Bug: 35622
Change-Id: Ibbe8645afc151b0e9b658f762497071d67be3836
---
M includes/media/Bitmap.php
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Gilles: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/media/Bitmap.php b/includes/media/Bitmap.php
index 9a3e927..c0d9b71 100644
--- a/includes/media/Bitmap.php
+++ b/includes/media/Bitmap.php
@@ -366,7 +366,7 @@
                        // background colour. After merging we reset the 
background
                        // to be white for the default background colour setting
                        // in the PNG image (which is used in old IE)
-                       $animation_post = array(
+                       $animation_pre = array(
                                '-background', 'transparent',
                                '-layers', 'merge',
                                '-background', 'white',
@@ -382,7 +382,7 @@
                                // bug 66323 - Greyscale images not rendered 
properly.
                                // So only take the "red" channel.
                                $channelOnly = array( '-channel', 'R', 
'-separate' );
-                               $animation_post = array_merge( $animation_post, 
$channelOnly );
+                               $animation_pre = array_merge( $animation_pre, 
$channelOnly );
                        }
                }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/147909
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibbe8645afc151b0e9b658f762497071d67be3836
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff <bawolff...@gmail.com>
Gerrit-Reviewer: Aaron Schulz <asch...@wikimedia.org>
Gerrit-Reviewer: Gilles <gdu...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to