diff options
| author | Owen Lin <owenlin@android.com> | 2012-08-06 19:52:26 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-06 19:52:27 -0700 |
| commit | eb311f5725171f97868acad2f3567b1fe7481e67 (patch) | |
| tree | 40d7b897779eb2262ec476053fdcc5c915db1ead | |
| parent | 351f3467bd976465727a3a867e8adccd9aadb0ad (diff) | |
| parent | 3da2799ea9bc7b711b164167d09bdda0bd8fee6f (diff) | |
| download | android_packages_apps_Snap-eb311f5725171f97868acad2f3567b1fe7481e67.tar.gz android_packages_apps_Snap-eb311f5725171f97868acad2f3567b1fe7481e67.tar.bz2 android_packages_apps_Snap-eb311f5725171f97868acad2f3567b1fe7481e67.zip | |
Merge "fix next ifd bug in ExifParser" into gb-ub-photos-arches
| -rw-r--r-- | src/com/android/gallery3d/exif/IfdParser.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/exif/IfdParser.java b/src/com/android/gallery3d/exif/IfdParser.java index e91b29dcd..c15a5b6d7 100644 --- a/src/com/android/gallery3d/exif/IfdParser.java +++ b/src/com/android/gallery3d/exif/IfdParser.java @@ -61,9 +61,10 @@ public class IfdParser { public int next() throws IOException { int offset = mTiffStream.getReadByteCount(); - if (offset < mEndOfTagOffset) { + offset = mNextOffset; skipTo(mNextOffset); + if(mNextOffset < mEndOfTagOffset) { mNextOffset += TAG_SIZE; return TYPE_NEW_TAG; |