From e5da585e6cb73cff8775b21a69a01f8bf513d2ab Mon Sep 17 00:00:00 2001
From: John Hoford <hoford@google.com>
Date: Wed, 17 Oct 2012 14:54:54 -0700
Subject: [PATCH] fix rotating normal images

bug:7353416
Change-Id: I86875286ea81982bdb55e9df22e44827b521d257
---
 src/com/android/gallery3d/filtershow/cache/ImageLoader.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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(),
-- 
2.11.0