Merge pull request #589 from mveunen/bugfix/apple-metadata-sometimes-…

…as-string Sometimes the Apple metadata is stored as a String. This fix will pre…
drewnoakes · Sep 14, 2022 · e9ff975 · e9ff975
2 parents 3670a36 + 0b2d61b
commit e9ff975
Showing 1 changed file with 17 additions and 7 deletions.
diff --git a/Source/com/drew/metadata/apple/AppleRunTimeReader.java b/Source/com/drew/metadata/apple/AppleRunTimeReader.java
@@ -67,13 +67,23 @@ private static void processAppleRunTime(@NotNull final AppleRunTimeMakernoteDire
 
             // https://developer.apple.com/documentation/coremedia/cmtime-u58
 
-            byte flags = (Byte)values.get("flags");
-
-            if ((flags & 0x1) == 0x1) {
-                directory.setInt(AppleRunTimeMakernoteDirectory.CMTimeFlags, flags);
-                directory.setInt(AppleRunTimeMakernoteDirectory.CMTimeEpoch, (Byte)values.get("epoch"));
-                directory.setLong(AppleRunTimeMakernoteDirectory.CMTimeScale, (Long)values.get("timescale"));
-                directory.setLong(AppleRunTimeMakernoteDirectory.CMTimeValue, (Long)values.get("value"));
+            Object flagsObject = values.get("flags");
+            if (flagsObject instanceof Byte) {
+                byte flags = (Byte) flagsObject;
+                if ((flags & 0x1) == 0x1) {
+                    directory.setInt(AppleRunTimeMakernoteDirectory.CMTimeFlags, flags);
+                    directory.setInt(AppleRunTimeMakernoteDirectory.CMTimeEpoch, (Byte) values.get("epoch"));
+                    directory.setLong(AppleRunTimeMakernoteDirectory.CMTimeScale, (Long) values.get("timescale"));
+                    directory.setLong(AppleRunTimeMakernoteDirectory.CMTimeValue, (Long) values.get("value"));
+                }
+            } else if (flagsObject instanceof String) {
+                byte flags = Byte.parseByte((String) flagsObject);
+                if ((flags & 0x1) == 0x1) {
+                    directory.setInt(AppleRunTimeMakernoteDirectory.CMTimeFlags, flags);
+                    directory.setInt(AppleRunTimeMakernoteDirectory.CMTimeEpoch, Byte.parseByte((String) values.get("epoch")));
+                    directory.setLong(AppleRunTimeMakernoteDirectory.CMTimeScale, Long.parseLong((String) values.get("timescale")));
+                    directory.setLong(AppleRunTimeMakernoteDirectory.CMTimeValue, Long.parseLong((String) values.get("value")));
+                }
             }
         }
     }