summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEarl Ou <shunhsingou@google.com>2012-08-08 15:20:01 +0800
committerEarl Ou <shunhsingou@google.com>2012-08-08 15:20:01 +0800
commit3fda31aa8d78ba7d4d323a6c111fb4bb33288573 (patch)
tree94d5b677bf52aaf3f89fdf8587d2f8401cc4f53f
parent0d64f476c62215c7738655f62b89f93ac60c7fe2 (diff)
downloadandroid_packages_apps_Snap-3fda31aa8d78ba7d4d323a6c111fb4bb33288573.tar.gz
android_packages_apps_Snap-3fda31aa8d78ba7d4d323a6c111fb4bb33288573.tar.bz2
android_packages_apps_Snap-3fda31aa8d78ba7d4d323a6c111fb4bb33288573.zip
ignore uncompressed thumbnail when test exif thumbnail
Change-Id: I32baae44994f3b113405082f55539e1a2a3db8bb
-rw-r--r--tests/src/com/android/gallery3d/exif/ExifParserTest.java6
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;