commit 85f460b8ba236167bccf560358aefd560f7b58f0
author John Hoford <hoford@google.com> Tue Oct 22 11:36:19 2013 -0700
committer John Hoford <hoford@google.com> Tue Oct 22 11:36:19 2013 -0700
tree 0b00a4fae5e1001bc9bd476f4c22dbc3ceb3cb3d
parent 5a1d760b60040a8a47d876a9accd27f0bc7be455

fix crop not supporting non-normal orientation

bug:11324471
Change-Id: Ib4a76ac1540700eeaa4ddd727b06f9a29b999827

src/com/android/gallery3d/filtershow/cache/ImageLoader.java

diff --git a/src/com/android/gallery3d/filtershow/cache/ImageLoader.java b/src/com/android/gallery3d/filtershow/cache/ImageLoader.java
index 69edd60..52c296c 100644
--- a/src/com/android/gallery3d/filtershow/cache/ImageLoader.java
+++ b/src/com/android/gallery3d/filtershow/cache/ImageLoader.java
@@ -129,36 +129,52 @@
         } finally {
             Utils.closeSilently(cursor);
         }
-
-        // Fall back to checking EXIF tags in file.
-        if (ContentResolver.SCHEME_FILE.equals(uri.getScheme())) {
-            String mimeType = getMimeType(uri);
-            if (!JPEG_MIME_TYPE.equals(mimeType)) {
-                return ORI_NORMAL;
-            }
-            String path = uri.getPath();
-            ExifInterface exif = new ExifInterface();
-            try {
+        ExifInterface exif = new ExifInterface();
+        InputStream is = null;
+        // Fall back to checking EXIF tags in file or input stream.
+        try {
+            if (ContentResolver.SCHEME_FILE.equals(uri.getScheme())) {
+                String mimeType = getMimeType(uri);
+                if (!JPEG_MIME_TYPE.equals(mimeType)) {
+                    return ORI_NORMAL;
+                }
+                String path = uri.getPath();
                 exif.readExif(path);
-                Integer tagval = exif.getTagIntValue(ExifInterface.TAG_ORIENTATION);
-                if (tagval != null) {
-                    int orientation = tagval;
-                    switch(orientation) {
-                        case ORI_NORMAL:
-                        case ORI_ROTATE_90:
-                        case ORI_ROTATE_180:
-                        case ORI_ROTATE_270:
-                        case ORI_FLIP_HOR:
-                        case ORI_FLIP_VERT:
-                        case ORI_TRANSPOSE:
-                        case ORI_TRANSVERSE:
-                            return orientation;
-                        default:
-                            return ORI_NORMAL;
-                    }
+            } else {
+                is = context.getContentResolver().openInputStream(uri);
+                exif.readExif(is);
+            }
+            return parseExif(exif);
+        } catch (IOException e) {
+            Log.w(LOGTAG, "Failed to read EXIF orientation", e);
+        } finally {
+            try {
+                if (is != null) {
+                    is.close();
                 }
             } catch (IOException e) {
-                Log.w(LOGTAG, "Failed to read EXIF orientation", e);
+                Log.w(LOGTAG, "Failed to close InputStream", e);
+            }
+        }
+        return ORI_NORMAL;
+    }
+
+    private static int parseExif(ExifInterface exif){
+        Integer tagval = exif.getTagIntValue(ExifInterface.TAG_ORIENTATION);
+        if (tagval != null) {
+            int orientation = tagval;
+            switch(orientation) {
+                case ORI_NORMAL:
+                case ORI_ROTATE_90:
+                case ORI_ROTATE_180:
+                case ORI_ROTATE_270:
+                case ORI_FLIP_HOR:
+                case ORI_FLIP_VERT:
+                case ORI_TRANSPOSE:
+                case ORI_TRANSVERSE:
+                    return orientation;
+                default:
+                    return ORI_NORMAL;
             }
         }
         return ORI_NORMAL;