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 | 11f7376cae5739fd847c291c25dc8b146cc159ae (patch) | |
| tree | d8a500be1ced2f9e8fd837e8721c774a72f8605b | |
| parent | 13722d8f4dc6d0b0f868f73885f5f1c1298590cc (diff) | |
| parent | eb8418af087dd20696255b80a97182c2b4ecc0d8 (diff) | |
| download | android_packages_apps_Gallery2-11f7376cae5739fd847c291c25dc8b146cc159ae.tar.gz android_packages_apps_Gallery2-11f7376cae5739fd847c291c25dc8b146cc159ae.tar.bz2 android_packages_apps_Gallery2-11f7376cae5739fd847c291c25dc8b146cc159ae.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; |