From: John Hoford <hoford@google.com>
Date: Wed, 17 Oct 2012 21:54:54 +0000 (-0700)
Subject: fix rotating normal images
X-Git-Tag: android-x86-6.0-r3~68^2~28^2~213^2~19^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2~428^2~2^2~766^2~167^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e5da585e6cb73cff8775b21a69a01f8bf513d2ab;p=android-x86%2Fpackages-apps-Camera2.git

fix rotating normal images

bug:7353416
Change-Id: I86875286ea81982bdb55e9df22e44827b521d257
---

diff --git a/src/com/android/gallery3d/filtershow/cache/ImageLoader.java b/src/com/android/gallery3d/filtershow/cache/ImageLoader.java
index 049c4a201..6beaed603 100644
--- a/src/com/android/gallery3d/filtershow/cache/ImageLoader.java
+++ b/src/com/android/gallery3d/filtershow/cache/ImageLoader.java
@@ -75,7 +75,6 @@ public class ImageLoader {
     public void loadBitmap(Uri uri,int size) {
         mUri = uri;
         mOrientation = getOrientation(uri);
-
         mOriginalBitmapSmall = loadScaledBitmap(uri, 160);
         if (mOriginalBitmapSmall == null) {
             // Couldn't read the bitmap, let's exit
@@ -161,7 +160,6 @@ public class ImageLoader {
                h = tmp;
            }
            switch(ori){
-               case ORI_NORMAL:
                case ORI_ROTATE_90:
                    matrix.setRotate(90,w/2f,h/2f);
                    break;
@@ -185,7 +183,9 @@ public class ImageLoader {
                    matrix.setRotate(270,w/2f,h/2f);
                    matrix.preScale(1, -1);
                    break;
+               case ORI_NORMAL:
                default:
+                   return bitmap;
             }
 
         return Bitmap.createBitmap(bitmap, 0, 0, bitmap.getWidth(),