summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJohn Hoford <hoford@google.com>2012-10-17 14:54:54 -0700
committerJohn Hoford <hoford@google.com>2012-10-17 14:54:54 -0700
commite5da585e6cb73cff8775b21a69a01f8bf513d2ab (patch)
treed147fe0b2d8e66799b1f171762af850e1d5681e3 /src
parenteb321f77e97b22acab15d60eeacf8a65dc8cceb1 (diff)
downloadandroid_packages_apps_Gallery2-e5da585e6cb73cff8775b21a69a01f8bf513d2ab.tar.gz
android_packages_apps_Gallery2-e5da585e6cb73cff8775b21a69a01f8bf513d2ab.tar.bz2
android_packages_apps_Gallery2-e5da585e6cb73cff8775b21a69a01f8bf513d2ab.zip
fix rotating normal images
bug:7353416 Change-Id: I86875286ea81982bdb55e9df22e44827b521d257
Diffstat (limited to 'src')
-rw-r--r--src/com/android/gallery3d/filtershow/cache/ImageLoader.java4
1 files 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(),