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

Timestamp:

2016-01-17T13:10:38+01:00 (9 years ago)

Author:

simon04

Message:

fix #11685 - Use sub-second exif/xmp data

File:

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

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

@@ -42 +42 @@
             Metadata metadata = JpegMetadataReader.readMetadata(filename);
             String dateStr = null;
-            OUTER:
+            String subSeconds = null;
             for (Directory dirIt : metadata.getDirectories()) {
                 for (Tag tag : dirIt.getTags()) {
@@ -48 +48 @@
                             !tag.getDescription().matches("\\[[0-9]+ .+\\]")) {
                         dateStr = tag.getDescription();
-                        break OUTER; // prefer this tag if known
                     }
                     if (tag.getTagType() == ExifIFD0Directory.TAG_DATETIME /* 0x0132 */ ||
                         tag.getTagType() == ExifSubIFDDirectory.TAG_DATETIME_DIGITIZED /* 0x9004 */) {
-                        dateStr = tag.getDescription();
+                        if (dateStr != null) {
+                            // prefer TAG_DATETIME_ORIGINAL
+                            dateStr = tag.getDescription();
+                        }
+                    }
+                    if (tag.getTagType() == ExifIFD0Directory.TAG_SUBSECOND_TIME_ORIGINAL) {
+                        subSeconds = tag.getDescription();
                     }
                 }
@@ -58 +63 @@
             if (dateStr != null) {
                 dateStr = dateStr.replace('/', ':'); // workaround for HTC Sensation bug, see #7228
-                return DateUtils.fromString(dateStr);
+                final Date date = DateUtils.fromString(dateStr);
+                if (subSeconds != null) {
+                    try {
+                        date.setTime(date.getTime() + Integer.parseInt(subSeconds));
+                    } catch (NumberFormatException e) {
+                        Main.warn("Failed parsing sub seconds from [{0}]", subSeconds);
+                        Main.warn(e);
+                    }
+                }
+                return date;
             }
         } catch (Exception e) {