Fix for r99911: don't use getImageArea() to determine the area for comparison against...

diff --git a/includes/media/Bitmap.php b/includes/media/Bitmap.php
index 021df42..035694e 100644 (file)
--- a/includes/media/Bitmap.php
+++ b/includes/media/Bitmap.php
@@ -47,7 +47,7 @@ class BitmapHandler extends ImageHandler {
                if ( is_null( $checkImageAreaHookResult ) ) {
                        global $wgMaxImageArea;
                        
-                       if ( $this->getImageArea( $image ) > $wgMaxImageArea &&
+                       if ( $srcWidth * $srcHeight > $wgMaxImageArea &&
                                        !( $image->getMimeType() == 'image/jpeg' && 
                                                self::getScalerType( false, false ) == 'im' ) ) {
                                # Only ImageMagick can efficiently downsize jpg images without loading