diff options
author | Earl Ou <shunhsingou@google.com> | 2012-10-24 10:44:03 +0800 |
---|---|---|
committer | Earl Ou <shunhsingou@google.com> | 2012-11-07 13:36:41 +0800 |
commit | cd42404ea4453f0a85539890be8e73c38ed7fb69 (patch) | |
tree | 04cafb37f4954ded3ac0c761bdc273da4aa35849 /gallerycommon/src/com/android/gallery3d/exif/ExifTag.java | |
parent | c188a0d5d2a8cfa4237daf4a94adce31f77151e4 (diff) | |
download | android_packages_apps_Snap-cd42404ea4453f0a85539890be8e73c38ed7fb69.tar.gz android_packages_apps_Snap-cd42404ea4453f0a85539890be8e73c38ed7fb69.tar.bz2 android_packages_apps_Snap-cd42404ea4453f0a85539890be8e73c38ed7fb69.zip |
Handle undefined tags and ignore copyright tag in exif test
Change-Id: I531518555257bdaefb79b681282c6aad07542b4b
Diffstat (limited to 'gallerycommon/src/com/android/gallery3d/exif/ExifTag.java')
-rw-r--r-- | gallerycommon/src/com/android/gallery3d/exif/ExifTag.java | 90 |
1 files changed, 2 insertions, 88 deletions
diff --git a/gallerycommon/src/com/android/gallery3d/exif/ExifTag.java b/gallerycommon/src/com/android/gallery3d/exif/ExifTag.java index 157a8db3b..d914f5869 100644 --- a/gallerycommon/src/com/android/gallery3d/exif/ExifTag.java +++ b/gallerycommon/src/com/android/gallery3d/exif/ExifTag.java @@ -157,7 +157,7 @@ public class ExifTag { public static final short TAG_GPS_DEST_DISTANCE = 26; public static final short TAG_GPS_PROCESSING_METHOD = 27; public static final short TAG_GPS_AREA_INFORMATION = 28; - public static final short TAG_GPS_DATA_STAMP = 29; + public static final short TAG_GPS_DATE_STAMP = 29; public static final short TAG_GPS_DIFFERENTIAL = 30; // Interoperability tag @@ -828,7 +828,7 @@ public class ExifTag { (IfdId.TYPE_IFD_GPS << 24) | TYPE_UNDEFINED << 16 | SIZE_UNDEFINED); sTagInfo.put(TAG_GPS_AREA_INFORMATION, (IfdId.TYPE_IFD_GPS << 24) | TYPE_UNDEFINED << 16 | SIZE_UNDEFINED); - sTagInfo.put(TAG_GPS_DATA_STAMP, + sTagInfo.put(TAG_GPS_DATE_STAMP, (IfdId.TYPE_IFD_GPS << 24) | TYPE_ASCII << 16 | 11); sTagInfo.put(TAG_GPS_DIFFERENTIAL, (IfdId.TYPE_IFD_GPS << 24) | TYPE_UNSIGNED_SHORT << 16 | 11); @@ -1398,92 +1398,6 @@ public class ExifTag { (length > mComponentCount) ? mComponentCount : length); } - private String undefinedTypeValueToString() { - StringBuilder sbuilder = new StringBuilder(); - byte buf[] = (byte[]) mValue; - switch (mTagId) { - case TAG_COMPONENTS_CONFIGURATION: - for(int i = 0, n = getComponentCount(); i < n; i++) { - if(i != 0) sbuilder.append(" "); - sbuilder.append(buf[i]); - } - break; - default: - if (buf.length == 1) { - sbuilder.append(buf[0]); - } else { - for (int i = 0, n = buf.length; i < n; i++) { - byte code = buf[i]; - if (code == 0) continue; - if (code > 31 && code < 127) { - sbuilder.append((char) code); - } else { - sbuilder.append('.'); - } - } - } - } - return sbuilder.toString(); - } - - /** - * Returns a string representation of the value of this tag. - */ - String valueToString() { - StringBuilder sbuilder = new StringBuilder(); - switch (getDataType()) { - case ExifTag.TYPE_UNDEFINED: - sbuilder.append(undefinedTypeValueToString()); - break; - case ExifTag.TYPE_UNSIGNED_BYTE: - byte buf[] = (byte[]) mValue; - for(int i = 0, n = getComponentCount(); i < n; i++) { - if(i != 0) sbuilder.append(" "); - sbuilder.append(buf[i]); - } - break; - case ExifTag.TYPE_ASCII: - buf = (byte[]) mValue; - for (int i = 0, n = buf.length; i < n; i++) { - byte code = buf[i]; - if (code == 0) break; - if (code > 31 && code < 127) { - sbuilder.append((char) code); - } else { - sbuilder.append('.'); - } - } - break; - case ExifTag.TYPE_UNSIGNED_LONG: - for(int i = 0, n = getComponentCount(); i < n; i++) { - if(i != 0) sbuilder.append(" "); - sbuilder.append(getUnsignedLong(i)); - } - break; - case ExifTag.TYPE_RATIONAL: - case ExifTag.TYPE_UNSIGNED_RATIONAL: - for(int i = 0, n = getComponentCount(); i < n; i++) { - Rational r = getRational(i); - if(i != 0) sbuilder.append(" "); - sbuilder.append(r.getNominator()).append("/").append(r.getDenominator()); - } - break; - case ExifTag.TYPE_UNSIGNED_SHORT: - for(int i = 0, n = getComponentCount(); i < n; i++) { - if(i != 0) sbuilder.append(" "); - sbuilder.append(getUnsignedShort(i)); - } - break; - case ExifTag.TYPE_LONG: - for(int i = 0, n = getComponentCount(); i < n; i++) { - if(i != 0) sbuilder.append(" "); - sbuilder.append(getLong(i)); - } - break; - } - return sbuilder.toString(); - } - /** * Returns true if the ID is one of the following: {@link #TAG_EXIF_IFD}, * {@link #TAG_GPS_IFD}, {@link #TAG_JPEG_INTERCHANGE_FORMAT}, |