Follow-up r83778: Need to de-rotate, so use 360 - angle instead of angle.

diff --git a/includes/media/Bitmap.php b/includes/media/Bitmap.php
index 0c717f7..8e43331 100644 (file)
--- a/includes/media/Bitmap.php
+++ b/includes/media/Bitmap.php
@@ -181,13 +181,13 @@ class BitmapHandler extends ImageHandler {
                        $scaler = 'client';
                } elseif ( !$wgUseImageResize ) {
                        $scaler = 'client';
-               } elseif ( $wgUseImageMagick ) {
+               }/* elseif ( $wgUseImageMagick ) {
                        $scaler = 'im';
                } elseif ( $wgCustomConvertCommand ) {
                        $scaler = 'custom';
                } elseif ( function_exists( 'imagecreatetruecolor' ) ) {
                        $scaler = 'gd';
-               } elseif ( class_exists( 'Imagick' ) ) {
+               }*/ elseif ( class_exists( 'Imagick' ) ) {
                        $scaler = 'imext';
                } else {
                        $scaler = 'client';
@@ -367,7 +367,7 @@ class BitmapHandler extends ImageHandler {
                        $im->setImageDepth( 8 );
                        
                        if ( $rotation ) {
-                               if ( !$im->rotateImage( new ImagickPixel( 'white' ), $rotation ) ) {
+                               if ( !$im->rotateImage( new ImagickPixel( 'white' ), 360 - $rotation ) ) {
                                        return $this->getMediaTransformError( $params, "Error rotating $rotation degrees" );
                                }
                        }