| Index: trunk/phase3/includes/media/Bitmap.php |
| — | — | @@ -181,13 +181,13 @@ |
| 182 | 182 | $scaler = 'client'; |
| 183 | 183 | } elseif ( !$wgUseImageResize ) { |
| 184 | 184 | $scaler = 'client'; |
| 185 | | - } elseif ( $wgUseImageMagick ) { |
| | 185 | + }/* elseif ( $wgUseImageMagick ) { |
| 186 | 186 | $scaler = 'im'; |
| 187 | 187 | } elseif ( $wgCustomConvertCommand ) { |
| 188 | 188 | $scaler = 'custom'; |
| 189 | 189 | } elseif ( function_exists( 'imagecreatetruecolor' ) ) { |
| 190 | 190 | $scaler = 'gd'; |
| 191 | | - } elseif ( class_exists( 'Imagick' ) ) { |
| | 191 | + }*/ elseif ( class_exists( 'Imagick' ) ) { |
| 192 | 192 | $scaler = 'imext'; |
| 193 | 193 | } else { |
| 194 | 194 | $scaler = 'client'; |
| — | — | @@ -367,7 +367,7 @@ |
| 368 | 368 | $im->setImageDepth( 8 ); |
| 369 | 369 | |
| 370 | 370 | if ( $rotation ) { |
| 371 | | - if ( !$im->rotateImage( new ImagickPixel( 'white' ), $rotation ) ) { |
| | 371 | + if ( !$im->rotateImage( new ImagickPixel( 'white' ), 360 - $rotation ) ) { |
| 372 | 372 | return $this->getMediaTransformError( $params, "Error rotating $rotation degrees" ); |
| 373 | 373 | } |
| 374 | 374 | } |