diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-10-14 01:58:54 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-10-14 01:58:54 -0700 |
| commit | beaa4f96cb9fee0fd32d531eb21966500f7ab7f4 (patch) | |
| tree | 66b3857e8b90c7e8d135ef2abf7c584315ecf9b0 /src/com/android | |
| parent | 8ebe2c9946d8b741f61de6106198dd408c3afe2b (diff) | |
| parent | 1434cc06e356b984f6a5dbf3e120a5413f669221 (diff) | |
| download | android_packages_apps_Gallery2-beaa4f96cb9fee0fd32d531eb21966500f7ab7f4.tar.gz android_packages_apps_Gallery2-beaa4f96cb9fee0fd32d531eb21966500f7ab7f4.tar.bz2 android_packages_apps_Gallery2-beaa4f96cb9fee0fd32d531eb21966500f7ab7f4.zip | |
Merge "SnapdraongGallery:Get HEIC exif" into android-snapdragonGallery.lnx.2.0
Diffstat (limited to 'src/com/android')
| -rwxr-xr-x | src/com/android/gallery3d/data/LocalImage.java | 3 | ||||
| -rwxr-xr-x[-rw-r--r--] | src/com/android/gallery3d/data/MediaItem.java | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/data/LocalImage.java b/src/com/android/gallery3d/data/LocalImage.java index 2743a3e32..1b5c88b26 100755 --- a/src/com/android/gallery3d/data/LocalImage.java +++ b/src/com/android/gallery3d/data/LocalImage.java @@ -356,7 +356,8 @@ public class LocalImage extends LocalMediaItem { public MediaDetails getDetails() { MediaDetails details = super.getDetails(); details.addDetail(MediaDetails.INDEX_ORIENTATION, Integer.valueOf(rotation)); - if (MIME_TYPE_JPEG.equals(mimeType)) { + if (MIME_TYPE_JPEG.equals(mimeType) || MIME_TYPE_HEIF.equals(mimeType) || + MIME_TYPE_HEIC.equals(mimeType)) { // ExifInterface returns incorrect values for photos in other format. // For example, the width and height of an webp images is always '0'. MediaDetails.extractExifInfo(details, filePath); diff --git a/src/com/android/gallery3d/data/MediaItem.java b/src/com/android/gallery3d/data/MediaItem.java index c27667c7b..da5813613 100644..100755 --- a/src/com/android/gallery3d/data/MediaItem.java +++ b/src/com/android/gallery3d/data/MediaItem.java @@ -37,6 +37,8 @@ public abstract class MediaItem extends MediaObject { public static final int IMAGE_ERROR = -1; public static final String MIME_TYPE_JPEG = "image/jpeg"; + public static final String MIME_TYPE_HEIF = "image/heif"; + public static final String MIME_TYPE_HEIC = "image/heic"; public static final String MIME_TYPE_GIF = "image/gif"; private static final int BYTESBUFFE_POOL_SIZE = 4; |