Changeset 11514 in josm for trunk/src/org/openstreetmap

Timestamp:

2017-01-30T23:21:38+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #14209 - EXIF: prefer DATETIME over DATETIME_DIGITIZED

File:

• trunk/src/org/openstreetmap/josm/tools/ExifReader.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/tools/ExifReader.java

@@ -44 +44 @@
             Metadata metadata = JpegMetadataReader.readMetadata(filename);
             String dateStr = null;
+            String dateTime = null;
             String subSeconds = null;
             for (Directory dirIt : metadata.getDirectories()) {
@@ -52 +53 @@
                     if (tag.getTagType() == ExifSubIFDDirectory.TAG_DATETIME_ORIGINAL /* 0x9003 */ &&
                             !tag.getDescription().matches("\\[[0-9]+ .+\\]")) {
+                        // prefer DATETIME_ORIGINAL
                         dateStr = tag.getDescription();
                     }
-                    if (tag.getTagType() == ExifIFD0Directory.TAG_DATETIME /* 0x0132 */ ||
-                        tag.getTagType() == ExifSubIFDDirectory.TAG_DATETIME_DIGITIZED /* 0x9004 */) {
-                        if (dateStr == null) {
-                            // prefer TAG_DATETIME_ORIGINAL
-                            dateStr = tag.getDescription();
-                        }
+                    if (tag.getTagType() == ExifIFD0Directory.TAG_DATETIME /* 0x0132 */) {
+                        // prefer DATETIME over DATETIME_DIGITIZED
+                        dateTime = tag.getDescription();
+                    }
+                    if (tag.getTagType() == ExifSubIFDDirectory.TAG_DATETIME_DIGITIZED /* 0x9004 */ && dateTime == null) {
+                        dateTime = tag.getDescription();
                     }
                     if (tag.getTagType() == ExifIFD0Directory.TAG_SUBSECOND_TIME_ORIGINAL) {
@@ -65 +67 @@
                     }
                 }
+            }
+            if (dateStr == null) {
+                dateStr = dateTime;
             }
             if (dateStr != null) {