diff options
| author | Earl Ou <shunhsingou@google.com> | 2012-08-08 15:20:01 +0800 |
|---|---|---|
| committer | Earl Ou <shunhsingou@google.com> | 2012-08-08 15:20:01 +0800 |
| commit | eb8418af087dd20696255b80a97182c2b4ecc0d8 (patch) | |
| tree | ddf2403f583ba98af266e237cd3f62c15375fe5f /tests | |
| parent | 0ee84c4254d16b584e6f3bf11d6c658631c349c0 (diff) | |
| download | android_packages_apps_Gallery2-eb8418af087dd20696255b80a97182c2b4ecc0d8.tar.gz android_packages_apps_Gallery2-eb8418af087dd20696255b80a97182c2b4ecc0d8.tar.bz2 android_packages_apps_Gallery2-eb8418af087dd20696255b80a97182c2b4ecc0d8.zip | |
ignore uncompressed thumbnail when test exif thumbnail
Change-Id: I32baae44994f3b113405082f55539e1a2a3db8bb
Diffstat (limited to 'tests')
| -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; |