| Index: branches/REL1_18/phase3/includes/media/Bitmap.php |
| — | — | @@ -42,7 +42,7 @@ |
| 43 | 43 | return true; |
| 44 | 44 | } |
| 45 | 45 | } |
| 46 | | - |
| | 46 | + |
| 47 | 47 | # Don't thumbnail an image so big that it will fill hard drives and send servers into swap |
| 48 | 48 | # JPEG has the handy property of allowing thumbnailing without full decompression, so we make |
| 49 | 49 | # an exception for it. |
| — | — | @@ -55,10 +55,10 @@ |
| 56 | 56 | |
| 57 | 57 | return true; |
| 58 | 58 | } |
| 59 | | - |
| | 59 | + |
| 60 | 60 | /** |
| 61 | 61 | * Extracts the width/height if the image will be scaled before rotating |
| 62 | | - * |
| | 62 | + * |
| 63 | 63 | * This will match the physical size/aspect ratio of the original image |
| 64 | 64 | * prior to application of the rotation -- so for a portrait image that's |
| 65 | 65 | * stored as raw landscape with 90-degress rotation, the resulting size |
| — | — | @@ -305,7 +305,7 @@ |
| 306 | 306 | if ( strval( $wgImageMagickTempDir ) !== '' ) { |
| 307 | 307 | $env['MAGICK_TMPDIR'] = $wgImageMagickTempDir; |
| 308 | 308 | } |
| 309 | | - |
| | 309 | + |
| 310 | 310 | $rotation = $this->getRotation( $image ); |
| 311 | 311 | list( $width, $height ) = $this->extractPreRotationDimensions( $params, $rotation ); |
| 312 | 312 | |