From 5e909e8090304de888edd519e674decacc03afac Mon Sep 17 00:00:00 2001
From: Bryan Tong Minh <btongminh@users.mediawiki.org>
Date: Sat, 12 Mar 2011 22:50:43 +0000
Subject: [PATCH] Follow-up r83778: Need to de-rotate, so use 360 - angle
 instead of angle.

---
 includes/media/Bitmap.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/includes/media/Bitmap.php b/includes/media/Bitmap.php
index 0c717f732c..8e433318d8 100644
--- 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" );
 				}
 			}
-- 
2.20.1