diff options
| author | John Hoford <hoford@google.com> | 2012-10-17 15:54:58 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-17 15:54:58 -0700 |
| commit | de8dbdff27e4b5c1626024e20fae9fb535238453 (patch) | |
| tree | 31d5ee149f0432994f6611fd3233a3a6fc92dc21 /src | |
| parent | ef8770944c5701f8c07ca87f939d7759622eaaa7 (diff) | |
| parent | e5da585e6cb73cff8775b21a69a01f8bf513d2ab (diff) | |
| download | android_packages_apps_Gallery2-de8dbdff27e4b5c1626024e20fae9fb535238453.tar.gz android_packages_apps_Gallery2-de8dbdff27e4b5c1626024e20fae9fb535238453.tar.bz2 android_packages_apps_Gallery2-de8dbdff27e4b5c1626024e20fae9fb535238453.zip | |
Merge "fix rotating normal images" into gb-ub-photos-arches
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/gallery3d/filtershow/cache/ImageLoader.java | 4 |
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(), |