Changeset 15217 in josm for trunk/src/com/drew/metadata/iptc

Timestamp:

2019-07-07T01:56:46+02:00 (7 years ago)

Author:

Don-vip

Message:

see #17848 - update to metadata-extractor 2.12.0

Location:

trunk/src/com/drew/metadata/iptc

Files:

• IptcDescriptor.java (modified) (1 diff)
• IptcDirectory.java (modified) (1 diff)
• IptcReader.java (modified) (3 diffs)
• Iso2022Converter.java (modified) (1 diff)

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

@@ -1 +1 @@
 /*
- * Copyright 2002-2017 Drew Noakes
+ * Copyright 2002-2019 Drew Noakes and contributors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

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

@@ -1 +1 @@
 /*
- * Copyright 2002-2017 Drew Noakes
+ * Copyright 2002-2019 Drew Noakes and contributors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

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

@@ -1 +1 @@
 /*
- * Copyright 2002-2017 Drew Noakes
+ * Copyright 2002-2019 Drew Noakes and contributors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
@@ -118 +118 @@
             }
 
-            // we need at least five bytes left to read a tag
-            if (offset + 5 > length) {
+            // we need at least four bytes left to read a tag
+            if (offset + 4 > length) {
                 directory.addError("Too few bytes remain for a valid IPTC tag");
                 return;
@@ -130 +130 @@
                 directoryType = reader.getUInt8();
                 tagType = reader.getUInt8();
-                // TODO support Extended DataSet Tag (see 1.5(c), p14, IPTC-IIMV4.2.pdf)
                 tagByteCount = reader.getUInt16();
+                if (tagByteCount > 32767) {
+                    // Extended DataSet Tag (see 1.5(c), p14, IPTC-IIMV4.2.pdf)
+                    tagByteCount = ((tagByteCount & 0x7FFF) << 16) | reader.getUInt16();
+                    offset += 2;
+                }
                 offset += 4;
             } catch (IOException e) {

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

@@ -1 +1 @@
 /*
- * Copyright 2002-2017 Drew Noakes
+ * Copyright 2002-2019 Drew Noakes and contributors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");