diff options
author | Hung-ying Tyan <tyanh@google.com> | 2012-09-06 03:08:04 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-06 03:08:05 -0700 |
commit | 441381d3ca400972bd05f6659d456c7a227778a0 (patch) | |
tree | 946996fe240620334cb64f8f327abf52541b642c /src/com/android/gallery3d/exif/ExifData.java | |
parent | 0aa21cfcb47437ba3e3368828d472fb61729e7e4 (diff) | |
parent | c27ecc21a04d901d8069dddd31a00d335e9ae097 (diff) | |
download | android_packages_apps_Snap-441381d3ca400972bd05f6659d456c7a227778a0.tar.gz android_packages_apps_Snap-441381d3ca400972bd05f6659d456c7a227778a0.tar.bz2 android_packages_apps_Snap-441381d3ca400972bd05f6659d456c7a227778a0.zip |
Merge "Rearrange the constants in ExifTag" into gb-ub-photos-arches
Diffstat (limited to 'src/com/android/gallery3d/exif/ExifData.java')
-rw-r--r-- | src/com/android/gallery3d/exif/ExifData.java | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/com/android/gallery3d/exif/ExifData.java b/src/com/android/gallery3d/exif/ExifData.java index 88fa13cab..0c16cc9aa 100644 --- a/src/com/android/gallery3d/exif/ExifData.java +++ b/src/com/android/gallery3d/exif/ExifData.java @@ -149,18 +149,22 @@ public class ExifData { gpsIfd = new IfdData(IfdId.TYPE_IFD_GPS); addIfdData(gpsIfd); } - ExifTag latTag = new ExifTag(ExifTag.GPS_TAG.TAG_GPS_LATITUDE, ExifTag.TYPE_RATIONAL, + ExifTag latTag = new ExifTag(ExifTag.TAG_GPS_LATITUDE, ExifTag.TYPE_RATIONAL, 3, IfdId.TYPE_IFD_GPS); - ExifTag longTag = new ExifTag(ExifTag.GPS_TAG.TAG_GPS_LONGITUDE, ExifTag.TYPE_RATIONAL, + ExifTag longTag = new ExifTag(ExifTag.TAG_GPS_LONGITUDE, ExifTag.TYPE_RATIONAL, 3, IfdId.TYPE_IFD_GPS); - ExifTag latRefTag = new ExifTag(ExifTag.GPS_TAG.TAG_GPS_LATITUDE_REF, + ExifTag latRefTag = new ExifTag(ExifTag.TAG_GPS_LATITUDE_REF, ExifTag.TYPE_ASCII, 2, IfdId.TYPE_IFD_GPS); - ExifTag longRefTag = new ExifTag(ExifTag.GPS_TAG.TAG_GPS_LONGITUDE_REF, + ExifTag longRefTag = new ExifTag(ExifTag.TAG_GPS_LONGITUDE_REF, ExifTag.TYPE_ASCII, 2, IfdId.TYPE_IFD_GPS); latTag.setValue(toExifLatLong(latitude)); longTag.setValue(toExifLatLong(longitude)); - latRefTag.setValue(latitude >= 0 ? "N" : "S"); - longRefTag.setValue(longitude >= 0 ? "E" : "W"); + latRefTag.setValue(latitude >= 0 + ? ExifTag.GpsLatitudeRef.NORTH + : ExifTag.GpsLatitudeRef.SOUTH); + longRefTag.setValue(longitude >= 0 + ? ExifTag.GpsLongitudeRef.EAST + : ExifTag.GpsLongitudeRef.WEST); gpsIfd.setTag(latTag); gpsIfd.setTag(longTag); gpsIfd.setTag(latRefTag); |