Changeset 8243 in josm for trunk/src/com/drew/imaging/jpeg/JpegMetadataReader.java

Timestamp:

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

Author:

Don-vip

Message:

fix #11359 - update to metadata-extractor 2.8.1

File:

• trunk/src/com/drew/imaging/jpeg/JpegMetadataReader.java (modified) (3 diffs)

trunk/src/com/drew/imaging/jpeg/JpegMetadataReader.java

@@ -35 +35 @@
 //import com.drew.metadata.adobe.AdobeJpegReader;
 import com.drew.metadata.exif.ExifReader;
+import com.drew.metadata.file.FileMetadataReader;
 //import com.drew.metadata.icc.IccReader;
 import com.drew.metadata.iptc.IptcReader;
@@ -79 +80 @@
     public static Metadata readMetadata(@NotNull File file, @Nullable Iterable<JpegSegmentMetadataReader> readers) throws JpegProcessingException, IOException
     {
-        InputStream inputStream = null;
-        try
-        {
-            inputStream = new FileInputStream(file);
-            return readMetadata(inputStream, readers);
+        InputStream inputStream = new FileInputStream(file);
+        Metadata metadata;
+        try {
+            metadata = readMetadata(inputStream, readers);
         } finally {
-            if (inputStream != null)
-                inputStream.close();
+            inputStream.close();
         }
+        new FileMetadataReader().read(file, metadata);
+        return metadata;
     }
 
@@ -123 +124 @@
         for (JpegSegmentMetadataReader reader : readers) {
             for (JpegSegmentType segmentType : reader.getSegmentTypes()) {
-                for (byte[] segmentBytes : segmentData.getSegments(segmentType)) {
-                    if (reader.canProcess(segmentBytes, segmentType)) {
-                        reader.extract(segmentBytes, metadata, segmentType);
-                    }
-                }
+                reader.readJpegSegments(segmentData.getSegments(segmentType), metadata, segmentType);
             }
         }