http://www.mediawiki.org/wiki/Special:Code/MediaWiki/83792
Revision: 83792
Author: btongminh
Date: 2011-03-12 22:50:43 +0000 (Sat, 12 Mar 2011)
Log Message:
-----------
Follow-up r83778: Need to de-rotate, so use 360 - angle instead of angle.
Modified Paths:
--------------
trunk/phase3/includes/media/Bitmap.php
Modified: trunk/phase3/includes/media/Bitmap.php
===================================================================
--- trunk/phase3/includes/media/Bitmap.php 2011-03-12 22:49:31 UTC (rev
83791)
+++ trunk/phase3/includes/media/Bitmap.php 2011-03-12 22:50:43 UTC (rev
83792)
@@ -181,13 +181,13 @@
$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 @@
$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" );
}
}
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
