(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 00d6dc2..6c57615 100644 (file)
--- 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";