dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d8dd0c6
)
Fix for r99911: don't use getImageArea() to determine the area for comparison against...
author
Tim Starling
<tstarling@users.mediawiki.org>
Mon, 28 Nov 2011 04:37:15 +0000
(
04:37
+0000)
committer
Tim Starling
<tstarling@users.mediawiki.org>
Mon, 28 Nov 2011 04:37:15 +0000
(
04:37
+0000)
includes/media/Bitmap.php
patch
|
blob
|
history
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