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

Timestamp:

2016-01-27T12:53:42+01:00 (9 years ago)

Author:

simon04

Message:

fix #11685 - Obtain EXIF fields only from EXIF directories

Fixes unit test ExifReaderTest.testReadTime

File:

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

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

@@ -7 +7 @@
 import java.util.Date;
 
+import com.drew.metadata.exif.ExifDirectoryBase;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -44 +45 @@
             String subSeconds = null;
             for (Directory dirIt : metadata.getDirectories()) {
+                if (!(dirIt instanceof ExifDirectoryBase)) {
+                    continue;
+                }
                 for (Tag tag : dirIt.getTags()) {
                     if (tag.getTagType() == ExifSubIFDDirectory.TAG_DATETIME_ORIGINAL /* 0x9003 */ &&