Changeset 8243 in josm for trunk/src/com/drew/metadata/iptc/IptcDescriptor.java

Timestamp:

2015-04-21T00:42:50+02:00 (9 years ago)

Author:

Don-vip

Message:

fix #11359 - update to metadata-extractor 2.8.1

File:

• trunk/src/com/drew/metadata/iptc/IptcDescriptor.java (modified) (2 diffs)

trunk/src/com/drew/metadata/iptc/IptcDescriptor.java

@@ -49 +49 @@
             case IptcDirectory.TAG_KEYWORDS:
                 return getKeywordsDescription();
+            case IptcDirectory.TAG_TIME_CREATED:
+                return getTimeCreatedDescription();
+            case IptcDirectory.TAG_DIGITAL_TIME_CREATED:
+                return getDigitalTimeCreatedDescription();
             default:
                 return super.getDescription(tagType);
@@ -227 +231 @@
     public String getTimeCreatedDescription()
     {
-        return _directory.getString(IptcDirectory.TAG_TIME_CREATED);
+        String s = _directory.getString(IptcDirectory.TAG_TIME_CREATED);
+        if (s == null)
+            return null;
+        if (s.length() == 6 || s.length() == 11)
+            return s.substring(0, 2) + ':' + s.substring(2, 4) + ':' + s.substring(4);
+        return s;
+    }
+
+    @Nullable
+    public String getDigitalTimeCreatedDescription()
+    {
+        String s = _directory.getString(IptcDirectory.TAG_DIGITAL_TIME_CREATED);
+        if (s == null)
+            return null;
+        if (s.length() == 6 || s.length() == 11)
+            return s.substring(0, 2) + ':' + s.substring(2, 4) + ':' + s.substring(4);
+        return s;
     }