PNG image writer does not close stream to save file

hansonr · hansonr · commit ac7ffcaa5eb2 · 2020-12-21T22:56:01.000-06:00
diff --git a/sources/net.sf.j2s.java.core/src/javax/imageio/ImageIO.java b/sources/net.sf.j2s.java.core/src/javax/imageio/ImageIO.java
@@ -33,6 +33,7 @@
 import java.awt.image.RenderedImage;
 import java.io.BufferedInputStream;
 import java.io.File;
+import java.io.FileOutputStream;
 import java.io.FilePermission;
 import java.io.IOException;
 import java.io.InputStream;
@@ -268,7 +269,7 @@ public static boolean writeJS(RenderedImage im, String formatName, ImageOutputSt
 	public static boolean writeJS(RenderedImage im, String formatName, File output)
 			throws IOException {
 		ImageWriter writer = getWriter(formatName);
-		return (writer != null && ((JSImageWriter)writer).write(im, output.getPath(), null));
+		return (writer != null && ((JSImageWriter)writer).write(im, output.getPath(), new FileOutputStream(output)));
 	}
 
 	/**
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/image/JSImageWriter.java b/sources/net.sf.j2s.java.core/src/swingjs/image/JSImageWriter.java
@@ -3,6 +3,7 @@
 import java.awt.image.BufferedImage;
 import java.awt.image.RenderedImage;
 import java.io.File;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.Hashtable;
@@ -64,8 +65,9 @@ public boolean write(RenderedImage im, String fileName, OutputStream out) {
 	    		outputChannel = (OC) out;
 	    		fileName = null;
 	    	}    
-	    	if (outputChannel == null)
+	    	if (outputChannel == null) {
 	    		outputChannel = new OC().setParams(null, fileName, false, (OutputStream) out);
+	    	}
 			params.put("outputChannel", outputChannel);
 			write(null, new IIOImage(im, null, null), null);
 		} catch (IOException e) {
