Merge pull request #3496 from melissalinkert/tiff-closeable

Make TiffParser and TiffSaver implement Closeable

Author: dgault

components/formats-bsd/src/loci/formats/tiff/TiffParser.java

@@ -32,6 +32,7 @@
 
 package loci.formats.tiff;
 
+import java.io.Closeable;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -59,7 +60,7 @@
  * @author Melissa Linkert melissa at glencoesoftware.com
  * @author Chris Allan callan at blackcat.ca
  */
-public class TiffParser {
+public class TiffParser implements Closeable {
 
   // -- Constants --
 
@@ -95,11 +96,14 @@ public class TiffParser {
   /** Codec options to be used when decoding compressed pixel data. */
   private CodecOptions codecOptions = CodecOptions.getDefaultOptions();
 
+  private boolean canClose = false;
+
   // -- Constructors --
 
   /** Constructs a new TIFF parser from the given file name. */
   public TiffParser(String filename) throws IOException {
     this(new RandomAccessInputStream(filename));
+    canClose = true;
   }
 
   /** Constructs a new TIFF parser from the given input source. */
@@ -114,6 +118,20 @@ public TiffParser(RandomAccessInputStream in) {
     catch (IOException e) { }
   }
 
+  // -- Closeable methods --
+
+  /**
+   * Close the underlying stream, if this TiffParser was constructed
+   * with a file path.  Closing a stream that was pre-initialized
+   * is potentially dangerous.
+   */
+  @Override
+  public void close() throws IOException {
+    if (canClose && in != null) {
+      in.close();
+    }
+  }
+
   // -- TiffParser methods --
 
   /**

components/formats-bsd/src/loci/formats/tiff/TiffSaver.java

@@ -33,6 +33,7 @@
 package loci.formats.tiff;
 
 import java.io.ByteArrayOutputStream;
+import java.io.Closeable;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.nio.charset.Charset;
@@ -60,7 +61,7 @@
  * @author Melissa Linkert melissa at glencoesoftware.com
  * @author Chris Allan callan at blackcat.ca
  */
-public class TiffSaver {
+public class TiffSaver implements Closeable {
 
   // -- Constructor --