From: Bryan Tong Minh <btongminh@users.mediawiki.org>
Date: Fri, 7 Oct 2011 18:48:36 +0000 (+0000)
Subject: (bug 31487) Don't specify -auto-orient, but specify image rotations ourselves
X-Git-Tag: 1.31.0-rc.0~27206
X-Git-Url: https://git.heureux-cyclage.org/?a=commitdiff_plain;h=11cfbad55c5e0bc38fdd8f5d9e0d48b398003a36;p=lhc%2Fweb%2Fwiklou.git

(bug 31487) Don't specify -auto-orient, but specify image rotations ourselves
---

diff --git a/includes/media/Bitmap.php b/includes/media/Bitmap.php
index 00d6dc28af..6c576153b9 100644
--- a/includes/media/Bitmap.php
+++ b/includes/media/Bitmap.php
@@ -318,7 +318,8 @@ class BitmapHandler extends ImageHandler {
 			( $params['comment'] !== ''
 				? " -set comment " . wfEscapeShellArg( $this->escapeMagickProperty( $params['comment'] ) )
 				: '' ) .
-			" -depth 8 $sharpen -auto-orient" .
+			" -depth 8 $sharpen " .
+			" -rotate -$rotation " .
 			" {$animation_post} " .
 			wfEscapeShellArg( $this->escapeMagickOutput( $params['dstPath'] ) ) . " 2>&1";