PngImageMetadata

Author: Glavo

src/conf/spotbugs-exclude-filter.xml

@@ -171,6 +171,16 @@
     <Method name="&lt;init&gt;" />
     <Bug pattern="EI_EXPOSE_REP2" />
   </Match>
+  <Match>
+    <Class name="org.apache.commons.imaging.formats.png.PngImageMetadata" />
+    <Method name="getExif" />
+    <Bug pattern="EI_EXPOSE_REP" />
+  </Match>
+  <Match>
+    <Class name="org.apache.commons.imaging.formats.png.PngImageMetadata" />
+    <Method name="&lt;init&gt;" />
+    <Bug pattern="EI_EXPOSE_REP2" />
+  </Match>
   <Match>
     <Class name="org.apache.commons.imaging.common.mylzw.BitsToByteInputStream" />
     <Method name="&lt;init&gt;" />

src/main/java/org/apache/commons/imaging/formats/png/PngImageMetadata.java

@@ -0,0 +1,95 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.imaging.formats.png;
+
+import org.apache.commons.imaging.common.ImageMetadata;
+import org.apache.commons.imaging.formats.tiff.TiffImageMetadata;
+import org.apache.commons.imaging.internal.Debug;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+public class PngImageMetadata implements ImageMetadata {
+
+    private static final String NEWLINE = System.getProperty("line.separator");
+
+    private final ImageMetadata textualInformation;
+    private final TiffImageMetadata exif;
+
+    public PngImageMetadata(ImageMetadata textualInformation) {
+        this(textualInformation, null);
+    }
+
+    public PngImageMetadata(ImageMetadata textualInformation, TiffImageMetadata exif) {
+        this.textualInformation = Objects.requireNonNull(textualInformation);
+        this.exif = exif;
+    }
+
+    public ImageMetadata getTextualInformation() {
+        return textualInformation;
+    }
+
+    public TiffImageMetadata getExif() {
+        return exif;
+    }
+
+    @Override
+    public String toString() {
+        return toString(null);
+    }
+
+    @Override
+    public String toString(String prefix) {
+        if (prefix == null) {
+            prefix = "";
+        }
+
+        final StringBuilder result = new StringBuilder();
+
+        result.append(prefix);
+        result.append("Textual information:");
+        result.append(NEWLINE);
+        result.append(textualInformation.toString("\t"));
+
+        if (exif != null) {
+            result.append(NEWLINE);
+            result.append(prefix);
+            result.append("Exif metadata:");
+            result.append(NEWLINE);
+            result.append(exif.toString("\t"));
+        }
+
+        return result.toString();
+    }
+
+    @Override
+    public List<? extends ImageMetadataItem> getItems() {
+        if (exif == null) {
+            return textualInformation.getItems();
+        }
+
+        ArrayList<ImageMetadataItem> result = new ArrayList<>();
+        result.addAll(textualInformation.getItems());
+        result.addAll(exif.getItems());
+        return result;
+    }
+
+    public void dump() {
+        Debug.debug(this.toString());
+    }
+}

src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java

@@ -263,21 +263,29 @@ public Dimension getImageSize(final ByteSource byteSource, final PngImagingParam
     @Override
     public ImageMetadata getMetadata(final ByteSource byteSource, final PngImagingParameters params)
             throws ImageReadException, IOException {
-        final List<PngChunk> chunks = readChunks(byteSource, new ChunkType[] { ChunkType.tEXt, ChunkType.zTXt, }, false);
+        final ChunkType[] chunkTypes = { ChunkType.tEXt, ChunkType.zTXt, ChunkType.iTXt, ChunkType.eXIf };
+        final List<PngChunk> chunks = readChunks(byteSource, chunkTypes, false);
 
         if (chunks.isEmpty()) {
             return null;
         }
 
-        final GenericImageMetadata result = new GenericImageMetadata();
+        final GenericImageMetadata textual = new GenericImageMetadata();
+        TiffImageMetadata exif = null;
 
         for (final PngChunk chunk : chunks) {
-            final PngTextChunk textChunk = (PngTextChunk) chunk;
-
-            result.add(textChunk.getKeyword(), textChunk.getText());
+            if (chunk instanceof PngTextChunk) {
+                final PngTextChunk textChunk = (PngTextChunk) chunk;
+                textual.add(textChunk.getKeyword(), textChunk.getText());
+            } else if (chunk.chunkType == ChunkType.eXIf.value) {
+                if (exif != null) {
+                    throw new ImageReadException("Duplicate eXIf chunk");
+                }
+                exif = (TiffImageMetadata) new TiffImageParser().getMetadata(chunk.getBytes());
+            }
         }
 
-        return result;
+        return new PngImageMetadata(textual, exif);
     }
 
     public TiffImageMetadata getExifMetadata(final ByteSource byteSource, TiffImagingParameters params)