summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d
diff options
context:
space:
mode:
authorEarl Ou <shunhsingou@google.com>2012-10-05 15:22:33 +0800
committerEarl Ou <shunhsingou@google.com>2012-10-12 02:19:18 +0800
commitfdff8bc8658c541d00aefdfa74ac9d61b1853eed (patch)
tree414165045216024b10d8e680721728644ca07b35 /src/com/android/gallery3d
parent968e68d546ca9c8943afe1e179d6c2174390c39e (diff)
downloadandroid_packages_apps_Snap-fdff8bc8658c541d00aefdfa74ac9d61b1853eed.tar.gz
android_packages_apps_Snap-fdff8bc8658c541d00aefdfa74ac9d61b1853eed.tar.bz2
android_packages_apps_Snap-fdff8bc8658c541d00aefdfa74ac9d61b1853eed.zip
Use exiftool as ground truth for Exif API test
The ground truth XML file was generated by parsing the output from Phil Harvey's exiftool. Then we can test photos from 5000+ different camera provided by exiftool's website. Change-Id: Ida2c0409929be450a3cbb4331504aadb41138bea
Diffstat (limited to 'src/com/android/gallery3d')
-rw-r--r--src/com/android/gallery3d/exif/ExifTag.java14
1 files changed, 12 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/exif/ExifTag.java b/src/com/android/gallery3d/exif/ExifTag.java
index 49cb6edbc..86ac7be74 100644
--- a/src/com/android/gallery3d/exif/ExifTag.java
+++ b/src/com/android/gallery3d/exif/ExifTag.java
@@ -1361,9 +1361,10 @@ public class ExifTag {
StringBuilder sbuilder = new StringBuilder();
switch (getDataType()) {
case ExifTag.TYPE_UNDEFINED:
+ sbuilder.append(new String((byte[]) mValue));
+ break;
case ExifTag.TYPE_UNSIGNED_BYTE:
- byte buf[] = new byte[getComponentCount()];
- getBytes(buf);
+ byte buf[] = (byte[]) mValue;
for(int i = 0, n = getComponentCount(); i < n; i++) {
if(i != 0) sbuilder.append(" ");
sbuilder.append(String.format("%02x", buf[i]));
@@ -1415,6 +1416,15 @@ public class ExifTag {
|| tagId == TAG_INTEROPERABILITY_IFD;
}
+ /**
+ * Returns true if the ID is one of the following: {@link #TAG_EXIF_IFD},
+ * {@link #TAG_GPS_IFD}, {@link #TAG_INTEROPERABILITY_IFD}
+ */
+ static boolean isSubIfdOffsetTag(short tagId) {
+ return tagId == TAG_EXIF_IFD
+ || tagId == TAG_GPS_IFD
+ || tagId == TAG_INTEROPERABILITY_IFD;
+ }
@Override
public boolean equals(Object obj) {
if (obj instanceof ExifTag) {