Fix for r101677: remove the extra parameters from the other getImageArea() callers.

diff --git a/includes/media/Bitmap.php b/includes/media/Bitmap.php
index 035694e..2424888 100644 (file)
--- a/includes/media/Bitmap.php
+++ b/includes/media/Bitmap.php
@@ -287,8 +287,7 @@ class BitmapHandler extends ImageHandler {
                        $quality = "-quality 95"; // zlib 9, adaptive filtering
 
                } elseif ( $params['mimeType'] == 'image/gif' ) {
-                       if ( $this->getImageArea( $image, $params['srcWidth'],
-                                       $params['srcHeight'] ) > $wgMaxAnimatedGifArea ) {
+                       if ( $this->getImageArea( $image ) > $wgMaxAnimatedGifArea ) {
                                // Extract initial frame only; we're so big it'll
                                // be a total drag. :P
                                $scene = 0;
@@ -376,8 +375,7 @@ class BitmapHandler extends ImageHandler {
                        } elseif( $params['mimeType'] == 'image/png' ) {
                                $im->setCompressionQuality( 95 );
                        } elseif ( $params['mimeType'] == 'image/gif' ) {
-                               if ( $this->getImageArea( $image, $params['srcWidth'],
-                                               $params['srcHeight'] ) > $wgMaxAnimatedGifArea ) {
+                               if ( $this->getImageArea( $image ) > $wgMaxAnimatedGifArea ) {
                                        // Extract initial frame only; we're so big it'll
                                        // be a total drag. :P
                                        $im->setImageScene( 0 );