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 | 6e2c8bb73cfcb4f0401231db1fa4af097e754300 (patch) | |
| tree | 4eb73f67446547154401b4c283f005971d837444 /src/com/android/gallery3d | |
| parent | ec6da4a15e8db7093fd2d97432906f2da87f3cc7 (diff) | |
| parent | 8bf999c568660e7b27c9952d29bcf60ed3bf7739 (diff) | |
| download | android_packages_apps_Gallery2-6e2c8bb73cfcb4f0401231db1fa4af097e754300.tar.gz android_packages_apps_Gallery2-6e2c8bb73cfcb4f0401231db1fa4af097e754300.tar.bz2 android_packages_apps_Gallery2-6e2c8bb73cfcb4f0401231db1fa4af097e754300.zip | |
Merge "fix next ifd bug in ExifParser" into gb-ub-photos-arches
Diffstat (limited to 'src/com/android/gallery3d')
| -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; |