r104387 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r104386‎ | r104387 | r104388 >
Date:04:40, 28 November 2011
Author:tstarling
Status:ok
Tags:
Comment:
Fix for r101677: remove the extra parameters from the other getImageArea() callers.
Modified paths:
  • /trunk/phase3/includes/media/Bitmap.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/media/Bitmap.php
@@ -287,8 +287,7 @@
288288 $quality = "-quality 95"; // zlib 9, adaptive filtering
289289
290290 } elseif ( $params['mimeType'] == 'image/gif' ) {
291 - if ( $this->getImageArea( $image, $params['srcWidth'],
292 - $params['srcHeight'] ) > $wgMaxAnimatedGifArea ) {
 291+ if ( $this->getImageArea( $image ) > $wgMaxAnimatedGifArea ) {
293292 // Extract initial frame only; we're so big it'll
294293 // be a total drag. :P
295294 $scene = 0;
@@ -376,8 +375,7 @@
377376 } elseif( $params['mimeType'] == 'image/png' ) {
378377 $im->setCompressionQuality( 95 );
379378 } elseif ( $params['mimeType'] == 'image/gif' ) {
380 - if ( $this->getImageArea( $image, $params['srcWidth'],
381 - $params['srcHeight'] ) > $wgMaxAnimatedGifArea ) {
 379+ if ( $this->getImageArea( $image ) > $wgMaxAnimatedGifArea ) {
382380 // Extract initial frame only; we're so big it'll
383381 // be a total drag. :P
384382 $im->setImageScene( 0 );

Follow-up revisions

RevisionCommit summaryAuthorDate
r104389MFT VipsScaler dependencies r99911, r99916, r99917, r101677, r104386, r104387...tstarling05:04, 28 November 2011

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r101677Per comments on r99911 move $wgMaxImageArea check back to normaliseParams(). ...btongminh20:48, 2 November 2011

Status & tagging log