Merge branch 'pr-12'
This closes #12
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 4fd3389..7343eb5 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -45,6 +45,9 @@
</properties>
<body>
<release version="1.0-alpha2" date="2019-??-??" description="Second 1.0 alpha release">
+ <action issue="IMAGING-165" dev="kinow" type="add" due-to="Michael Groß">
+ Add the fields from TiffReader.Collector to TiffContents
+ </action>
<action issue="IMAGING-230" dev="kinow" type="fix">
Properly close resources with try-with-resources in T4AndT6Compression
</action>
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffContents.java b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffContents.java
index ca61ed8..39e8eaf 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffContents.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffContents.java
@@ -27,10 +27,12 @@
public class TiffContents {
public final TiffHeader header;
public final List<TiffDirectory> directories;
+ public final List<TiffField> tiffFields;
- public TiffContents(final TiffHeader tiffHeader, final List<TiffDirectory> directories) {
+ public TiffContents(final TiffHeader tiffHeader, final List<TiffDirectory> directories, final List<TiffField> tiffFields) {
this.header = tiffHeader;
this.directories = Collections.unmodifiableList(directories);
+ this.tiffFields = Collections.unmodifiableList(tiffFields);
}
public List<TiffElement> getElements() throws ImageReadException {
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffReader.java b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffReader.java
index 8e9ea25..9e94da8 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffReader.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffReader.java
@@ -327,7 +327,7 @@
}
public TiffContents getContents() {
- return new TiffContents(tiffHeader, directories);
+ return new TiffContents(tiffHeader, directories, fields);
}
}
