diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2020-11-17 10:15:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-11-17 10:15:28 +0000 |
| commit | e1bb3d343fad666fb57ccb152d512d26aa8eb3d2 (patch) | |
| tree | 57f6a7df1b2d3d51e149944cb28068413a071ae2 | |
| parent | ebd3208cb375f8b93db861fcb48512548ecd35ba (diff) | |
| parent | 348a199ae4b3917f2dbe3b4eb251bd740fc92e9e (diff) | |
| download | support-snap-temp-L63300000950376234.tar.gz | |
Merge "Merge cherrypicks of [1500798] into androidx-exifinterface-release" into androidx-exifinterface-releasesnap-temp-L70000000950373003snap-temp-L63300000950376234snap-temp-L46900000950367927snap-temp-L42800000950364683snap-temp-L28600000950373009snap-temp-L14500000950367696
| -rw-r--r-- | exifinterface/exifinterface/src/main/java/androidx/exifinterface/media/ExifInterface.java | 8 |
1 files changed, 5 insertions, 3 deletions
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 fe8200c93ae..c0347c474ed 100644 --- a/exifinterface/exifinterface/src/main/java/androidx/exifinterface/media/ExifInterface.java +++ b/exifinterface/exifinterface/src/main/java/androidx/exifinterface/media/ExifInterface.java @@ -3634,13 +3634,15 @@ public class ExifInterface { new ExifTag(TAG_DEFAULT_CROP_SIZE, 50720, IFD_FORMAT_USHORT, IFD_FORMAT_ULONG) }; - // Primary image IFD GPS Info tags (See JEITA CP-3451C Section 4.6.8 Tag Support Levels) + // Primary image IFD GPS Info tags (See JEITA CP-3451C Section 4.6.6 Tag Support Levels) private static final ExifTag[] IFD_GPS_TAGS = new ExifTag[] { new ExifTag(TAG_GPS_VERSION_ID, 0, IFD_FORMAT_BYTE), new ExifTag(TAG_GPS_LATITUDE_REF, 1, IFD_FORMAT_STRING), - new ExifTag(TAG_GPS_LATITUDE, 2, IFD_FORMAT_URATIONAL), + // Allow SRATIONAL to be compatible with apps using wrong format and + // even if it is negative, it may be valid latitude / longitude. + new ExifTag(TAG_GPS_LATITUDE, 2, IFD_FORMAT_URATIONAL, IFD_FORMAT_SRATIONAL), new ExifTag(TAG_GPS_LONGITUDE_REF, 3, IFD_FORMAT_STRING), - new ExifTag(TAG_GPS_LONGITUDE, 4, IFD_FORMAT_URATIONAL), + new ExifTag(TAG_GPS_LONGITUDE, 4, IFD_FORMAT_URATIONAL, IFD_FORMAT_SRATIONAL), new ExifTag(TAG_GPS_ALTITUDE_REF, 5, IFD_FORMAT_BYTE), new ExifTag(TAG_GPS_ALTITUDE, 6, IFD_FORMAT_URATIONAL), new ExifTag(TAG_GPS_TIMESTAMP, 7, IFD_FORMAT_URATIONAL), |