[Jmol-commits] SF.net SVN: jmol:[19806] branches/v14_0/Jmol/src

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

Revision: 19806
          http://sourceforge.net/p/jmol/code/19806
Author:   hansonr
Date:     2014-06-10 03:55:31 +0000 (Tue, 10 Jun 2014)
Log Message:
-----------
___JmolVersion="14.0.17_2014.06.10"

bug fix: write("PNGJ") broken in 14.0.17_2014.06.09 

Modified Paths:
--------------
    branches/v14_0/Jmol/src/javajs/util/ZipTools.java
    branches/v14_0/Jmol/src/org/jmol/viewer/Jmol.properties

Modified: branches/v14_0/Jmol/src/javajs/util/ZipTools.java
===================================================================
--- branches/v14_0/Jmol/src/javajs/util/ZipTools.java	2014-06-10 02:57:38 UTC (rev 19805)
+++ branches/v14_0/Jmol/src/javajs/util/ZipTools.java	2014-06-10 03:55:31 UTC (rev 19806)
@@ -325,7 +325,7 @@
 
   @Override
   public void readFileAsMap(BufferedInputStream bis, Map<String, Object> bdata, String name) {
-    int pt = name.indexOf("|");
+    int pt = (name == null ? -1 : name.indexOf("|"));
     name = (pt >= 0 ? name.substring(pt + 1) : null);
     try {
       if (Rdr.isPngZipStream(bis)) {

Modified: branches/v14_0/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- branches/v14_0/Jmol/src/org/jmol/viewer/Jmol.properties	2014-06-10 02:57:38 UTC (rev 19805)
+++ branches/v14_0/Jmol/src/org/jmol/viewer/Jmol.properties	2014-06-10 03:55:31 UTC (rev 19806)
@@ -9,8 +9,13 @@
 #  The quotes above look odd for a parameter file, but they are 
 #  important for the JavaScript version of Jmol.
 
-___JmolVersion="14.0.17_2014.06.09"
 
+___JmolVersion="14.0.17_2014.06.10"
+
+bug fix: write("PNGJ") broken in 14.0.17_2014.06.09 
+
+JmolVersion="14.0.17_2014.06.09"
+
 synchonized with Jmol 14.1.17 June 9, 2014
 
 bug fix: zoomto broken

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