diff options
| author | Owen Lin <owenlin@android.com> | 2012-08-10 01:20:03 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-10 01:20:04 -0700 |
| commit | fdc13c38bed810979fbed5629e2bf53b5c10470e (patch) | |
| tree | a4a9434d0994bc15dc32dba8b38524c41de4684b | |
| parent | 52363de6ad9d4a06fd141c1af2707d979de4ad3a (diff) | |
| parent | 3fda31aa8d78ba7d4d323a6c111fb4bb33288573 (diff) | |
| download | android_packages_apps_Snap-fdc13c38bed810979fbed5629e2bf53b5c10470e.tar.gz android_packages_apps_Snap-fdc13c38bed810979fbed5629e2bf53b5c10470e.tar.bz2 android_packages_apps_Snap-fdc13c38bed810979fbed5629e2bf53b5c10470e.zip | |
Merge "ignore uncompressed thumbnail when test exif thumbnail" into gb-ub-photos-arches
| -rw-r--r-- | tests/src/com/android/gallery3d/exif/ExifParserTest.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/src/com/android/gallery3d/exif/ExifParserTest.java b/tests/src/com/android/gallery3d/exif/ExifParserTest.java index 35f4f3f1f..8c47b1498 100644 --- a/tests/src/com/android/gallery3d/exif/ExifParserTest.java +++ b/tests/src/com/android/gallery3d/exif/ExifParserTest.java @@ -413,6 +413,12 @@ public class ExifParserTest extends InstrumentationTestCase { long unsignedInt = ifdParser.readUnsignedInt(); assertTrue(unsignedInt <= Integer.MAX_VALUE); thumbSize = (int) unsignedInt; + } else if (tag.getTagId() == ExifTag.TIFF_TAG.TAG_COMPRESSION) { + if (ifdParser.readUnsignedShort() == + ExifTag.TIFF_TAG.COMPRESSION_UNCOMPRESSION) { + // This test doesn't apply to uncompression thumbnail. + return; + } } isFinishRead = thumbOffset != 0 && thumbSize != 0; break; |