diff options
author | Hung-ying Tyan <tyanh@google.com> | 2012-10-11 17:57:46 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-11 17:57:48 -0700 |
commit | 5742617986d31d7bbd7d5e69cc33927a0a6dcb5f (patch) | |
tree | b7040089d46eeca4c256da30b5f0ad954306e38d /src/com/android/gallery3d | |
parent | 5087f82c09d4ffa874b462007c7102fff1349033 (diff) | |
parent | fdff8bc8658c541d00aefdfa74ac9d61b1853eed (diff) | |
download | android_packages_apps_Snap-5742617986d31d7bbd7d5e69cc33927a0a6dcb5f.tar.gz android_packages_apps_Snap-5742617986d31d7bbd7d5e69cc33927a0a6dcb5f.tar.bz2 android_packages_apps_Snap-5742617986d31d7bbd7d5e69cc33927a0a6dcb5f.zip |
Merge "Use exiftool as ground truth for Exif API test" into gb-ub-photos-bryce
Diffstat (limited to 'src/com/android/gallery3d')
-rw-r--r-- | src/com/android/gallery3d/exif/ExifTag.java | 14 |
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) { |