From c27ecc21a04d901d8069dddd31a00d335e9ae097 Mon Sep 17 00:00:00 2001 From: Earl Ou Date: Thu, 30 Aug 2012 14:46:58 +0800 Subject: Rearrange the constants in ExifTag Change-Id: I62ab6e52869dfa5b3fee7993bd109f4c5eed91a9 --- src/com/android/gallery3d/exif/ExifData.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'src/com/android/gallery3d/exif/ExifData.java') 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); -- cgit v1.2.3