commit e1b916d1f235df260f6ec5d8ecc1c1797634e232
author Jin Seok Park <jinpark@google.com> Mon Jul 19 16:04:41 2021 +0900
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Mon Jul 26 14:11:59 2021 +0000
tree e547d7772f12b695768ab3347ed059edf18d7743
parent cb210465c992f38b170c10ea1e67445bc87c6ea5

Replace non-thumbnail tags with thumbnail tags

Bug: 193010129
Test: ./gradlew :exifinterface:exifinterface:connectedCheck
Change-Id: I2c2f47436cc266fecef8793473435fd849f5ed3b
(cherry picked from commit 9239c2e67c0a9ac26c7c2c82f7063f7dc1941c76)

exifinterface/exifinterface/src/main/java/androidx/exifinterface/media/ExifInterface.java

diff --git a/exifinterface/exifinterface/src/main/java/androidx/exifinterface/media/ExifInterface.java b/exifinterface/exifinterface/src/main/java/androidx/exifinterface/media/ExifInterface.java
index a5e2e62..108c18a 100644
--- a/exifinterface/exifinterface/src/main/java/androidx/exifinterface/media/ExifInterface.java
+++ b/exifinterface/exifinterface/src/main/java/androidx/exifinterface/media/ExifInterface.java
@@ -4905,9 +4905,9 @@
             }
 
             ExifAttribute imageLengthAttribute =
-                    (ExifAttribute) mAttributes[IFD_TYPE_THUMBNAIL].get(TAG_IMAGE_LENGTH);
+                    mAttributes[IFD_TYPE_THUMBNAIL].get(TAG_THUMBNAIL_IMAGE_LENGTH);
             ExifAttribute imageWidthAttribute =
-                    (ExifAttribute) mAttributes[IFD_TYPE_THUMBNAIL].get(TAG_IMAGE_WIDTH);
+                    mAttributes[IFD_TYPE_THUMBNAIL].get(TAG_THUMBNAIL_IMAGE_WIDTH);
             if (imageLengthAttribute != null && imageWidthAttribute != null) {
                 int imageLength = imageLengthAttribute.getIntValue(mExifByteOrder);
                 int imageWidth = imageWidthAttribute.getIntValue(mExifByteOrder);
@@ -5683,10 +5683,12 @@
                 case MARKER_SOF14:
                 case MARKER_SOF15: {
                     in.skipFully(1);
-                    mAttributes[imageType].put(TAG_IMAGE_LENGTH, ExifAttribute.createULong(
-                            in.readUnsignedShort(), mExifByteOrder));
-                    mAttributes[imageType].put(TAG_IMAGE_WIDTH, ExifAttribute.createULong(
-                            in.readUnsignedShort(), mExifByteOrder));
+                    mAttributes[imageType].put(imageType != IFD_TYPE_THUMBNAIL
+                                    ? TAG_IMAGE_LENGTH : TAG_THUMBNAIL_IMAGE_LENGTH,
+                            ExifAttribute.createULong(in.readUnsignedShort(), mExifByteOrder));
+                    mAttributes[imageType].put(imageType != IFD_TYPE_THUMBNAIL
+                                    ? TAG_IMAGE_WIDTH : TAG_THUMBNAIL_IMAGE_WIDTH,
+                            ExifAttribute.createULong(in.readUnsignedShort(), mExifByteOrder));
                     length -= 5;
                     break;
                 }