Changeset 182 in josm for src/org/openstreetmap

Timestamp:

2006-12-31T17:08:14+01:00 (18 years ago)

Author:

imi

Message:

• fixed geoimage reader to priorize the entry of DateTimeOriginal and DateTimeDigitalized over DateTime

File:

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

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

@@ -18 +18 @@
 
         @SuppressWarnings("unchecked") public static Date readTime(File filename) throws ParseException {
+                Date date = null;
                 try {
                 Metadata metadata = JpegMetadataReader.readMetadata(filename);
@@ -23 +24 @@
                     for (Iterator<Tag> tagIt = dirIt.next().getTagIterator(); tagIt.hasNext();) {
                         Tag tag = tagIt.next();
-                        if (tag.getTagType() == 0x132 || tag.getTagType() == 0x9003 || tag.getTagType() == 0x9004)
+                        if (tag.getTagType() == 0x9003)
                                 return DateParser.parse(tag.getDescription());
+                        if (tag.getTagType() == 0x132 || tag.getTagType() == 0x9004)
+                                date = DateParser.parse(tag.getDescription());
                     }
                 }
@@ -32 +35 @@
                 e.printStackTrace();
         }
-                return null;
+                return date;
         }
 }