Merge pull request processing#1819 from OffenesFELD/master

benfry · benfry · commit 5a813634cd3b · 2013-05-30T12:54:53.000-07:00
Fixes processing#1810 where a png data would be written instead of jpeg data.
diff --git a/core/src/processing/core/PImage.java b/core/src/processing/core/PImage.java
@@ -3132,6 +3132,7 @@ protected boolean saveImageIO(String path) throws IOException {
       ImageWriter writer = null;
       ImageWriteParam param = null;
       IIOMetadata metadata = null;
+      
       if (extension.equals("jpg") || extension.equals("jpeg")) {
         if ((writer = imageioWriter("jpeg")) != null) {
           // Set JPEG quality to 90% with baseline optimization. Setting this
@@ -3143,12 +3144,16 @@ protected boolean saveImageIO(String path) throws IOException {
           param.setCompressionQuality(0.9f);
         }
       }
-      if ((writer = imageioWriter("png")) != null) {
-        param = writer.getDefaultWriteParam();
-        if (false) {
-          metadata = imageioDPI(writer, param, 100);
+
+      if (extension.equals("png")) {
+        if ((writer = imageioWriter("png")) != null) {
+          param = writer.getDefaultWriteParam();
+          if (false) {
+            metadata = imageioDPI(writer, param, 100);
+          }
         }
       }
+
       if (writer != null) {
         BufferedOutputStream output =
           new BufferedOutputStream(PApplet.createOutput(file));
