From: nicolasroard <nicolasroard@google.com>
Date: Mon, 29 Oct 2012 16:35:47 +0000 (-0700)
Subject: Reset rotation flag
X-Git-Tag: android-x86-7.1-r1~1268^2~43
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=dc03ae144d838714446b239f2b0c519d956af6ff;p=android-x86%2Fpackages-apps-Gallery2.git

Reset rotation flag

bug:7386221
Change-Id: I45a615a880a96d54bbde0a5ce648e02ff86db1de
---

diff --git a/src/com/android/gallery3d/filtershow/cache/ImageLoader.java b/src/com/android/gallery3d/filtershow/cache/ImageLoader.java
index 308e49c14..a89199602 100644
--- a/src/com/android/gallery3d/filtershow/cache/ImageLoader.java
+++ b/src/com/android/gallery3d/filtershow/cache/ImageLoader.java
@@ -168,6 +168,7 @@ public class ImageLoader {
             mOriginalBitmapSmall = rotateToPortrait(mOriginalBitmapSmall, mOrientation);
             mOriginalBitmapLarge = rotateToPortrait(mOriginalBitmapLarge, mOrientation);
         }
+        mZoomOrientation = mOrientation;
         mCache.setOriginalBitmap(mOriginalBitmapSmall);
         mHiresCache.setOriginalBitmap(mOriginalBitmapLarge);
         warnListeners();
@@ -175,7 +176,6 @@ public class ImageLoader {
 
     public static Bitmap rotateToPortrait(Bitmap bitmap,int ori) {
            Matrix matrix = new Matrix();
-           mZoomOrientation = ori;
            int w = bitmap.getWidth();
            int h = bitmap.getHeight();
            if (ori == ORI_ROTATE_90 ||