Changeset 8243 in josm for trunk/src/com/drew/metadata/jpeg

Timestamp:

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

Author:

Don-vip

Message:

fix #11359 - update to metadata-extractor 2.8.1

Location:

trunk/src/com/drew/metadata/jpeg

Files:

• JpegCommentReader.java (modified) (1 diff)
• JpegReader.java (modified) (2 diffs)

trunk/src/com/drew/metadata/jpeg/JpegCommentReader.java

@@ -48 +48 @@
     }
 
-    public void extract(@NotNull byte[] segmentBytes, @NotNull Metadata metadata, @NotNull JpegSegmentType segmentType)
+    public void readJpegSegments(@NotNull Iterable<byte[]> segments, @NotNull Metadata metadata, @NotNull JpegSegmentType segmentType)
     {
-        JpegCommentDirectory directory = metadata.getOrCreateDirectory(JpegCommentDirectory.class);
+        for (byte[] segmentBytes : segments) {
+            JpegCommentDirectory directory = new JpegCommentDirectory();
+            metadata.addDirectory(directory);
 
-        // The entire contents of the directory are the comment
-        directory.setString(JpegCommentDirectory.TAG_COMMENT, new String(segmentBytes));
+            // The entire contents of the directory are the comment
+            directory.setString(JpegCommentDirectory.TAG_COMMENT, new String(segmentBytes));
+        }
     }
 }

trunk/src/com/drew/metadata/jpeg/JpegReader.java

@@ -63 +63 @@
     }
 
-    public boolean canProcess(@NotNull byte[] segmentBytes, @NotNull JpegSegmentType segmentType)
+    public void readJpegSegments(@NotNull Iterable<byte[]> segments, @NotNull Metadata metadata, @NotNull JpegSegmentType segmentType)
     {
-        return true;
+        for (byte[] segmentBytes : segments) {
+            extract(segmentBytes, metadata, segmentType);
+        }
     }
 
-    public void extract(@NotNull byte[] segmentBytes, @NotNull Metadata metadata, @NotNull JpegSegmentType segmentType)
+    public void extract(byte[] segmentBytes, Metadata metadata, JpegSegmentType segmentType)
     {
-        if (metadata.containsDirectory(JpegDirectory.class)) {
-            // If this directory is already present, discontinue this operation.
-            // We only store metadata for the *first* matching SOFn segment.
-            return;
-        }
-
-        JpegDirectory directory = metadata.getOrCreateDirectory(JpegDirectory.class);
+        JpegDirectory directory = new JpegDirectory();
+        metadata.addDirectory(directory);
 
         // The value of TAG_COMPRESSION_TYPE is determined by the segment type found
@@ -101 +98 @@
                 directory.setObject(JpegDirectory.TAG_COMPONENT_DATA_1 + i, component);
             }
-
         } catch (IOException ex) {
             directory.addError(ex.getMessage());