diff options
| author | Owen Lin <owenlin@google.com> | 2012-08-09 18:22:40 +0800 |
|---|---|---|
| committer | Owen Lin <owenlin@google.com> | 2012-08-13 13:45:28 +0800 |
| commit | 1a6969b26ce90b6acfb4af8aba2f4f8f208e2e57 (patch) | |
| tree | 88a02c74e2bc6a25971ec7ea8d27c1e8b2a615cb /src/com/android | |
| parent | de8079dab0123ea087c3c9adbcf1c476bcf79a42 (diff) | |
| download | android_packages_apps_Snap-1a6969b26ce90b6acfb4af8aba2f4f8f208e2e57.tar.gz android_packages_apps_Snap-1a6969b26ce90b6acfb4af8aba2f4f8f208e2e57.tar.bz2 android_packages_apps_Snap-1a6969b26ce90b6acfb4af8aba2f4f8f208e2e57.zip | |
Extract EXIF info only for JPEG files
bug: 6489840
Change-Id: I0ad682bffa5374d0d61ebaa502cc8b90e469b4c8
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/gallery3d/data/LocalImage.java | 6 | ||||
| -rw-r--r-- | src/com/android/gallery3d/data/LocalMediaItem.java | 2 | ||||
| -rw-r--r-- | src/com/android/gallery3d/ui/PopupList.java | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/src/com/android/gallery3d/data/LocalImage.java b/src/com/android/gallery3d/data/LocalImage.java index 370ef2686..b10b96289 100644 --- a/src/com/android/gallery3d/data/LocalImage.java +++ b/src/com/android/gallery3d/data/LocalImage.java @@ -309,7 +309,11 @@ public class LocalImage extends LocalMediaItem { public MediaDetails getDetails() { MediaDetails details = super.getDetails(); details.addDetail(MediaDetails.INDEX_ORIENTATION, Integer.valueOf(rotation)); - MediaDetails.extractExifInfo(details, filePath); + if (MIME_TYPE_JPEG.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); + } return details; } diff --git a/src/com/android/gallery3d/data/LocalMediaItem.java b/src/com/android/gallery3d/data/LocalMediaItem.java index fdc973e8d..eb054d03e 100644 --- a/src/com/android/gallery3d/data/LocalMediaItem.java +++ b/src/com/android/gallery3d/data/LocalMediaItem.java @@ -86,6 +86,8 @@ public abstract class LocalMediaItem extends MediaItem { details.addDetail(MediaDetails.INDEX_TITLE, caption); DateFormat formater = DateFormat.getDateTimeInstance(); details.addDetail(MediaDetails.INDEX_DATETIME, formater.format(new Date(dateTakenInMs))); + details.addDetail(MediaDetails.INDEX_WIDTH, width); + details.addDetail(MediaDetails.INDEX_HEIGHT, height); if (GalleryUtils.isValidLocation(latitude, longitude)) { details.addDetail(MediaDetails.INDEX_LOCATION, new double[] {latitude, longitude}); diff --git a/src/com/android/gallery3d/ui/PopupList.java b/src/com/android/gallery3d/ui/PopupList.java index ee02029c7..a5fbb09a8 100644 --- a/src/com/android/gallery3d/ui/PopupList.java +++ b/src/com/android/gallery3d/ui/PopupList.java @@ -18,7 +18,6 @@ import android.widget.PopupWindow; import android.widget.TextView; import com.android.gallery3d.R; -import com.android.gallery3d.common.Utils; import java.util.ArrayList; @@ -86,7 +85,6 @@ public class PopupList { new OnItemClickListener() { @Override public void onItemClick(AdapterView<?> parent, View view, int position, long id) { - Utils.debug("onItemClick: %s, %s", position, id); if (mPopupWindow == null) return; mPopupWindow.dismiss(); if (mOnPopupItemClickListener != null) { |