summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOwen Lin <owenlin@android.com>2012-08-06 19:52:08 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-08-06 19:52:09 -0700
commit351f3467bd976465727a3a867e8adccd9aadb0ad (patch)
tree3a19d3816af418934fc2aa84750fc210cb840f40
parentf5592d983ebb0a1bb9822b6aed0f2935a581cfbd (diff)
parent52f093f1b7b99622c35931f0af47349d32a67e19 (diff)
downloadandroid_packages_apps_Snap-351f3467bd976465727a3a867e8adccd9aadb0ad.tar.gz
android_packages_apps_Snap-351f3467bd976465727a3a867e8adccd9aadb0ad.tar.bz2
android_packages_apps_Snap-351f3467bd976465727a3a867e8adccd9aadb0ad.zip
Merge "Fix bug when call next() after nextidf in exif parser" into gb-ub-photos-arches
-rw-r--r--src/com/android/gallery3d/exif/IfdParser.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/exif/IfdParser.java b/src/com/android/gallery3d/exif/IfdParser.java
index 6638dafcb..e91b29dcd 100644
--- a/src/com/android/gallery3d/exif/IfdParser.java
+++ b/src/com/android/gallery3d/exif/IfdParser.java
@@ -85,6 +85,8 @@ public class IfdParser {
} else {
if (offset <= mOffsetToNextIfd) {
skipTo(mOffsetToNextIfd);
+ // Reset mOffsetToNextIfd to 0 so next call to next() will point to the end
+ mOffsetToNextIfd = 0;
return TYPE_NEXT_IFD;
} else {
return TYPE_END;