diff options
author | nicolasroard <nicolasroard@google.com> | 2012-10-29 10:05:48 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-29 10:05:48 -0700 |
commit | 4939eccb3c458b2308c99e494355afcc17bc1cb8 (patch) | |
tree | 048e6b6871694b5e3ba16a2645e7a5755bab6960 | |
parent | d75dffab97b8d589be5a79a7ee0c05a06de0ee3c (diff) | |
parent | 373fe6a155425c6488ab610157184633637314b4 (diff) | |
download | android_packages_apps_Snap-4939eccb3c458b2308c99e494355afcc17bc1cb8.tar.gz android_packages_apps_Snap-4939eccb3c458b2308c99e494355afcc17bc1cb8.tar.bz2 android_packages_apps_Snap-4939eccb3c458b2308c99e494355afcc17bc1cb8.zip |
am dc03ae14: Reset rotation flag
* commit 'dc03ae144d838714446b239f2b0c519d956af6ff':
Reset rotation flag
-rw-r--r-- | src/com/android/gallery3d/filtershow/cache/ImageLoader.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 || |