summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorEarl Ou <shunhsingou@google.com>2012-08-30 14:46:58 +0800
committerEarl Ou <shunhsingou@google.com>2012-09-06 13:28:23 +0800
commitc27ecc21a04d901d8069dddd31a00d335e9ae097 (patch)
tree6300aa51ed727f61daceccae943f9b4c2364c4ec /tests
parent61152454278c53d2251128779f18ac4fbac6a605 (diff)
downloadandroid_packages_apps_Snap-c27ecc21a04d901d8069dddd31a00d335e9ae097.zip
android_packages_apps_Snap-c27ecc21a04d901d8069dddd31a00d335e9ae097.tar.gz
android_packages_apps_Snap-c27ecc21a04d901d8069dddd31a00d335e9ae097.tar.bz2
Rearrange the constants in ExifTag
Change-Id: I62ab6e52869dfa5b3fee7993bd109f4c5eed91a9
Diffstat (limited to 'tests')
-rw-r--r--tests/src/com/android/gallery3d/exif/ExifParserTest.java8
-rw-r--r--tests/src/com/android/gallery3d/exif/ExifReaderTest.java20
2 files changed, 14 insertions, 14 deletions
diff --git a/tests/src/com/android/gallery3d/exif/ExifParserTest.java b/tests/src/com/android/gallery3d/exif/ExifParserTest.java
index e967e3d..1af106f 100644
--- a/tests/src/com/android/gallery3d/exif/ExifParserTest.java
+++ b/tests/src/com/android/gallery3d/exif/ExifParserTest.java
@@ -176,7 +176,7 @@ public class ExifParserTest extends InstrumentationTestCase {
break;
case ExifParser.EVENT_NEW_TAG:
ExifTag tag = parser.getTag();
- if (tag.getTagId() == ExifTag.TIFF_TAG.TAG_MODEL) {
+ if (tag.getTagId() == ExifTag.TAG_MODEL) {
if (tag.hasValue()) {
isTagFound = true;
checkTag(tag);
@@ -188,7 +188,7 @@ public class ExifParserTest extends InstrumentationTestCase {
break;
case ExifParser.EVENT_VALUE_OF_REGISTERED_TAG:
tag = parser.getTag();
- assertEquals(ExifTag.TIFF_TAG.TAG_MODEL, tag.getTagId());
+ assertEquals(ExifTag.TAG_MODEL, tag.getTagId());
checkTag(tag);
isTagFound = true;
break;
@@ -209,8 +209,8 @@ public class ExifParserTest extends InstrumentationTestCase {
switch (event) {
case ExifParser.EVENT_NEW_TAG:
ExifTag tag = parser.getTag();
- if (tag.getTagId() == ExifTag.TIFF_TAG.TAG_COMPRESSION) {
- if (tag.getUnsignedShort(0) == ExifTag.TIFF_TAG.COMPRESSION_JPEG) {
+ if (tag.getTagId() == ExifTag.TAG_COMPRESSION) {
+ if (tag.getUnsignedShort(0) == ExifTag.Compression.JPEG) {
mIsContainCompressedImage = true;
}
}
diff --git a/tests/src/com/android/gallery3d/exif/ExifReaderTest.java b/tests/src/com/android/gallery3d/exif/ExifReaderTest.java
index e4ed8eb..236c0ae 100644
--- a/tests/src/com/android/gallery3d/exif/ExifReaderTest.java
+++ b/tests/src/com/android/gallery3d/exif/ExifReaderTest.java
@@ -69,38 +69,38 @@ public class ExifReaderTest extends InstrumentationTestCase {
private void checkThumbnail(ExifData exifData) {
IfdData ifd1 = exifData.getIfdData(IfdId.TYPE_IFD_1);
if (ifd1 != null) {
- if (ifd1.getTag(ExifTag.TIFF_TAG.TAG_COMPRESSION).getUnsignedShort(0) ==
- ExifTag.TIFF_TAG.COMPRESSION_JPEG) {
+ if (ifd1.getTag(ExifTag.TAG_COMPRESSION).getUnsignedShort(0) ==
+ ExifTag.Compression.JPEG) {
assertTrue(exifData.hasCompressedThumbnail());
byte[] thumbnail = exifData.getCompressedThumbnail();
assertTrue(BitmapFactory.decodeByteArray(thumbnail, 0, thumbnail.length) != null);
} else {
// Try to check the strip count with the formula provided by EXIF spec.
- int planarType = ExifTag.TIFF_TAG.PLANAR_CONFIGURATION_CHUNKY;
- ExifTag planarTag = ifd1.getTag(ExifTag.TIFF_TAG.TAG_PLANAR_CONFIGURATION);
+ int planarType = ExifTag.PlanarConfiguration.CHUNKY;
+ ExifTag planarTag = ifd1.getTag(ExifTag.TAG_PLANAR_CONFIGURATION);
if (planarTag != null) {
planarType = planarTag.getUnsignedShort(0);
}
- ExifTag heightTag = ifd1.getTag(ExifTag.TIFF_TAG.TAG_IMAGE_HEIGHT);
- ExifTag rowPerStripTag = ifd1.getTag(ExifTag.TIFF_TAG.TAG_ROWS_PER_STRIP);
+ ExifTag heightTag = ifd1.getTag(ExifTag.TAG_IMAGE_LENGTH);
+ ExifTag rowPerStripTag = ifd1.getTag(ExifTag.TAG_ROWS_PER_STRIP);
int imageLength = getUnsignedIntOrShort(heightTag);
int rowsPerStrip = getUnsignedIntOrShort(rowPerStripTag);
int stripCount = ifd1.getTag(
- ExifTag.TIFF_TAG.TAG_STRIP_OFFSETS).getComponentCount();
+ ExifTag.TAG_STRIP_OFFSETS).getComponentCount();
- if (planarType == ExifTag.TIFF_TAG.PLANAR_CONFIGURATION_CHUNKY) {
+ if (planarType == ExifTag.PlanarConfiguration.CHUNKY) {
assertTrue(stripCount == (imageLength + rowsPerStrip - 1) / rowsPerStrip);
} else {
- ExifTag samplePerPixelTag = ifd1.getTag(ExifTag.TIFF_TAG.TAG_SAMPLES_PER_PIXEL);
+ ExifTag samplePerPixelTag = ifd1.getTag(ExifTag.TAG_SAMPLES_PER_PIXEL);
int samplePerPixel = samplePerPixelTag.getUnsignedShort(0);
assertTrue(stripCount ==
(imageLength + rowsPerStrip - 1) / rowsPerStrip * samplePerPixel);
}
for (int i = 0; i < stripCount; i++) {
- ExifTag byteCountTag = ifd1.getTag(ExifTag.TIFF_TAG.TAG_STRIP_BYTE_COUNTS);
+ ExifTag byteCountTag = ifd1.getTag(ExifTag.TAG_STRIP_BYTE_COUNTS);
if (byteCountTag.getDataType() == ExifTag.TYPE_UNSIGNED_SHORT) {
assertEquals(byteCountTag.getUnsignedShort(i), exifData.getStrip(i).length);
} else {