[Jmol-commits] SF.net SVN: jmol: [8235] trunk/Jmol/src/org

[<ha...@us...>]

Revision: 8235
          http://jmol.svn.sourceforge.net/jmol/?rev=8235&view=rev
Author:   hansonr
Date:     2007-09-10 19:50:28 -0700 (Mon, 10 Sep 2007)

Log Message:
-----------
11.3.19 bug fix for PNG writing default 0 compression instead of 2, as in 11.2.0

Modified Paths:
--------------
    trunk/Jmol/src/org/jmol/viewer/Eval.java
    trunk/Jmol/src/org/jmol/viewer/Jmol.properties
    trunk/Jmol/src/org/openscience/jmol/app/ImageCreator.java
    trunk/Jmol/src/org/openscience/jmol/app/Jmol.java

Modified: trunk/Jmol/src/org/jmol/viewer/Eval.java
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Eval.java	2007-09-10 06:05:29 UTC (rev 8234)
+++ trunk/Jmol/src/org/jmol/viewer/Eval.java	2007-09-11 02:50:28 UTC (rev 8235)
@@ -7466,7 +7466,7 @@
       //      if (isApplet)
       //      evalError(GT._("The {0} command is not available for the applet.",
       //        "WRITE CLIPBOARD"));
-    } else if (Parser.isOneOf(val.toLowerCase(), "jpg;jpeg;jpg64") && tokAt(pt + 1) == Token.integer) {
+    } else if (Parser.isOneOf(val.toLowerCase(), "png;jpg;jpeg;jpg64") && tokAt(pt + 1) == Token.integer) {
         quality = intParameter(++pt);
     }
 
@@ -7554,8 +7554,13 @@
         evalError(GT._("No data available"));
     } else {
       len = -1;
-      if (quality <= 0)
-        quality = 75;
+      if (data == "PNG") {
+        if (quality == Integer.MIN_VALUE)
+          quality = 2;
+        else if (quality < 0 || quality > 9)
+          quality = 0;
+      } else if (quality <= 0)
+        quality = 75; //JPG
     }
     if (len == 0)
       len = data.length();
@@ -7574,7 +7579,7 @@
           + (fileName == null ? "CLIPBOARD" : fileName)
           + (len >= 0 ? "; length=" + len : "")
           + (isImage ? "; width=" + width + "; height=" + height : "")
-          + (quality > 0 ? "; quality=" + quality : ""));
+          + (quality >= 0 ? "; quality=" + quality : ""));
     }
     return data;
   }

Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Jmol.properties	2007-09-10 06:05:29 UTC (rev 8234)
+++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties	2007-09-11 02:50:28 UTC (rev 8235)
@@ -1,5 +1,6 @@
 version=11.3.19_dev
 
+# bug fix: write PNG default was 0 compression. -q flag was OK for setting 0-9
 # -----------------------------------------------------------------------------
 
 #version=11.3.18

Modified: trunk/Jmol/src/org/openscience/jmol/app/ImageCreator.java
===================================================================
--- trunk/Jmol/src/org/openscience/jmol/app/ImageCreator.java	2007-09-10 06:05:29 UTC (rev 8234)
+++ trunk/Jmol/src/org/openscience/jmol/app/ImageCreator.java	2007-09-11 02:50:28 UTC (rev 8235)
@@ -81,8 +81,7 @@
           PpmEncoder pc = new PpmEncoder(eImage, os);
           pc.encode();
         } else if (type_or_text.equalsIgnoreCase("PNG")) {
-          PngEncoder png = new PngEncoder(eImage);
-          png.setCompressionLevel(quality == 0 ? 2 : quality); //reasonable? 500x500 is 38K
+          PngEncoder png = new PngEncoder(eImage, false, PngEncoder.FILTER_NONE, quality);
           byte[] pngbytes = png.pngEncode();
           os.write(pngbytes);
         } else if (type_or_text.equalsIgnoreCase("JPG64")) {

Modified: trunk/Jmol/src/org/openscience/jmol/app/Jmol.java
===================================================================
--- trunk/Jmol/src/org/openscience/jmol/app/Jmol.java	2007-09-10 06:05:29 UTC (rev 8234)
+++ trunk/Jmol/src/org/openscience/jmol/app/Jmol.java	2007-09-11 02:50:28 UTC (rev 8235)
@@ -510,7 +510,7 @@
 
     OptionBuilder.withLongOpt("quality");
     // OptionBuilder.withDescription(GT._("overall window width x height, e.g. {0}", "-g512x616"));
-    OptionBuilder.withDescription(GT._("JPG image quality (1-100)"));
+    OptionBuilder.withDescription(GT._("JPG image quality (1-100; default 75) or PNG image compression (0-9; default 2, maximum compression 9"));
     OptionBuilder.withValueSeparator();
     OptionBuilder.hasArg();
     options.addOption(OptionBuilder.create("q"));


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.