From a1789ddde42033f1b05cc4929491214ee6e79383 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Thu, 17 Dec 2015 09:15:42 +0100 Subject: Update to MediaWiki 1.26.0 --- includes/media/Bitmap.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'includes/media/Bitmap.php') diff --git a/includes/media/Bitmap.php b/includes/media/Bitmap.php index 3b1d978e..0cc093bf 100644 --- a/includes/media/Bitmap.php +++ b/includes/media/Bitmap.php @@ -92,9 +92,8 @@ class BitmapHandler extends TransformationalImageHandler { // JPEG decoder hint to reduce memory, available since IM 6.5.6-2 $decoderHint = array( '-define', "jpeg:size={$params['physicalDimensions']}" ); } - } elseif ( $params['mimeType'] == 'image/png' ) { + } elseif ( $params['mimeType'] == 'image/png' || $params['mimeType'] == 'image/webp' ) { $quality = array( '-quality', '95' ); // zlib 9, adaptive filtering - } elseif ( $params['mimeType'] == 'image/gif' ) { if ( $this->getImageArea( $image ) > $wgMaxAnimatedGifArea ) { // Extract initial frame only; we're so big it'll @@ -121,9 +120,9 @@ class BitmapHandler extends TransformationalImageHandler { '-layers', 'merge', '-background', 'white', ); - wfSuppressWarnings(); + MediaWiki\suppressWarnings(); $xcfMeta = unserialize( $image->getMetadata() ); - wfRestoreWarnings(); + MediaWiki\restoreWarnings(); if ( $xcfMeta && isset( $xcfMeta['colorType'] ) && $xcfMeta['colorType'] === 'greyscale-alpha' -- cgit v1.2.2