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/ExifData.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/ExifData.java')
| -rw-r--r-- | gallerycommon/src/com/android/gallery3d/exif/ExifData.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gallerycommon/src/com/android/gallery3d/exif/ExifData.java b/gallerycommon/src/com/android/gallery3d/exif/ExifData.java index 7f7971384..96ccb5b91 100644 --- a/gallerycommon/src/com/android/gallery3d/exif/ExifData.java +++ b/gallerycommon/src/com/android/gallery3d/exif/ExifData.java @@ -127,7 +127,9 @@ public class ExifData { } for (int i = 0; i < IfdId.TYPE_IFD_COUNT; i++) { - if (!Util.equals(data.getIfdData(i), getIfdData(i))) return false; + IfdData ifd1 = data.getIfdData(i); + IfdData ifd2 = getIfdData(i); + if ((ifd1 != ifd2) && (ifd1 != null && !ifd1.equals(ifd2))) return false; } return true; } |