Merge branch 'master' of ssh://jogamp.org/srv/scm/jogl into mark

37 files changed, 690 insertions, 257 deletions

diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java b/make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java
index bfe2759c0..fbe7484c4 100644
--- a/make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java
@@ -63,7 +63,7 @@ private final void initBufferObjectExtensionChecks() {
   haveGL15                  = isExtensionAvailable("GL_VERSION_1_5");
   haveGL21                  = isExtensionAvailable("GL_VERSION_2_1");
   haveARBVertexBufferObject = isExtensionAvailable("GL_ARB_vertex_buffer_object");
-  haveARBVertexArrayObject  = _context.getGLVersionNumber().compareTo(GLContext.Version30) >= 0 ||
+  haveARBVertexArrayObject  = _context.getGLVersionNumber().compareTo(GLContext.Version300) >= 0 ||
                               isExtensionAvailable("GL_ARB_vertex_array_object");
 }
 
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
index 5f0cdf7fa..c0c4764fb 100644
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -206,7 +206,7 @@ function jrun() {
     #D_ARGS="-Djogl.debug.GLContext -Dnewt.debug=all"
     #D_ARGS="-Dnewt.debug=all"
     #D_ARGS="-Djogl.debug.GLCanvas -Djogl.debug.GLJPanel"
-    #D_ARGS="-Djogl.debug.PNGImage"
+    D_ARGS="-Djogl.debug.PNGImage"
     #D_ARGS="-Djogl.debug.JPEGImage"
     #D_ARGS="-Djogl.debug.GLDrawable -Dnativewindow.debug.GraphicsConfiguration -Djogl.debug.CapabilitiesChooser"
     #X_ARGS="-Dsun.java2d.noddraw=True -Dsun.java2d.opengl=True -Dsun.java2d.xrender=false"
@@ -408,7 +408,7 @@ function testawtswt() {
 #testnoawt com.jogamp.opengl.test.junit.newt.mm.TestScreenMode01cNEWT $*
 #testnoawt com.jogamp.opengl.test.junit.newt.mm.TestScreenMode01dNEWT $*
 #testnoawt com.jogamp.opengl.test.junit.newt.mm.TestScreenMode02aNEWT $*
-testnoawt com.jogamp.opengl.test.junit.newt.mm.TestScreenMode02bNEWT $*
+#testnoawt com.jogamp.opengl.test.junit.newt.mm.TestScreenMode02bNEWT $*
 #testnoawt com.jogamp.opengl.test.junit.newt.mm.ManualScreenMode03aNEWT $*
 #testnoawt -Djava.awt.headless=true com.jogamp.opengl.test.junit.newt.TestGLWindows01NEWT $*
 #testnoawt com.jogamp.opengl.test.junit.newt.TestGLWindowWarpPointer01NEWT $*
@@ -545,7 +545,8 @@ testnoawt com.jogamp.opengl.test.junit.newt.mm.TestScreenMode02bNEWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.util.texture.TestJPEGJoglAWTCompareNewtAWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.util.texture.TestJPEGJoglAWTBenchmarkNewtAWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.util.texture.TestJPEGTextureFromFileNEWT $*
-#testnoawt com.jogamp.opengl.test.junit.jogl.util.texture.TestPNGImage01NEWT $*
+#testnoawt com.jogamp.opengl.test.junit.jogl.util.texture.TestPNGImage00NEWT $*
+testnoawt com.jogamp.opengl.test.junit.jogl.util.texture.TestPNGImage01NEWT $*
 #testawt com.jogamp.opengl.test.junit.jogl.util.texture.TestPNGTextureFromFileAWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.util.texture.TestPNGTextureFromFileNEWT $*
 #testawt com.jogamp.opengl.test.junit.jogl.util.texture.TestGLReadBufferUtilTextureIOWrite01AWT $*
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderUtil.java b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderUtil.java
index 7d110659a..066b2054d 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderUtil.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderUtil.java
@@ -221,7 +221,7 @@ public class ShaderUtil {
     /** Returns true if GeometryShader is supported, i.e. whether GLContext is ≥ 3.2 or ARB_geometry_shader4 extension is available. */ 
     public static boolean isGeometryShaderSupported(GL _gl) {
       final GLContext ctx = _gl.getContext();
-      return ctx.getGLVersionNumber().compareTo(GLContext.Version32) >= 0 ||
+      return ctx.getGLVersionNumber().compareTo(GLContext.Version320) >= 0 ||
              ctx.isExtensionAvailable(GLExtensions.ARB_geometry_shader4);
     }
 
diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/Texture.java b/src/jogl/classes/com/jogamp/opengl/util/texture/Texture.java
index bf85bea87..d6a8090fb 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/texture/Texture.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/Texture.java
@@ -52,18 +52,32 @@ import com.jogamp.opengl.util.texture.spi.*;
  * Represents an OpenGL texture object. Contains convenience routines
  * for enabling/disabling OpenGL texture state, binding this texture,
  * and computing texture coordinates for both the entire image as well
- * as a sub-image. 
+ * as a sub-image.
+ * 
+ * <a name="textureCallOrder"><h5>Order of Texture Commands</h5></a> 
+ * <p>
+ * Due to many confusions w/ texture usage, following list described the order
+ * and semantics of texture unit selection, binding and enabling.
+ * <ul>
+ *   <li><i>Optional:</i> Set active textureUnit via <code>gl.glActiveTexture(GL.GL_TEXTURE0 + textureUnit)</code>, <code>0</code> is default.</li>
+ *   <li>Bind <code>textureId</code> -> active <code>textureUnit</code>'s <code>textureTarget</code> via <code>gl.glBindTexture(textureTarget, textureId)</code></li>
+ *   <li><i>Compatible Context Only:</i> Enable active <code>textureUnit</code>'s <code>textureTarget</code> via <code>glEnable(textureTarget)</code>.
+ *   <li><i>Optional:</i> Fiddle with the texture parameters and/or environment settings.</li>
+ *   <li>GLSL: Use <code>textureUnit</code> in your shader program, enable shader program.</li>
+ *   <li>Issue draw commands</li>
+ * </ul>
+ * </p>
  * 
  * <p><a name="nonpow2"><b>Non-power-of-two restrictions</b></a>
  * <br> When creating an OpenGL texture object, the Texture class will
- * attempt to leverage the <a
- * href="http://www.opengl.org/registry/specs/ARB/texture_non_power_of_two.txt">GL_ARB_texture_non_power_of_two</a>
- * and <a
- * href="http://www.opengl.org/registry/specs/ARB/texture_rectangle.txt">GL_ARB_texture_rectangle</a>
- * extensions (in that order) whenever possible.  If neither extension
- * is available, the Texture class will simply upload a non-pow2-sized
+ * attempt to use <i>non-power-of-two textures</i> (NPOT) if available, see {@link GL#isNPOTTextureAvailable()}.
+ * Further more, 
+ * <a href="http://www.opengl.org/registry/specs/ARB/texture_rectangle.txt">GL_ARB_texture_rectangle</a>
+ * (RECT) will be attempted on OSX w/ ATI drivers.
+ * If NPOT is not available or RECT not chosen, the Texture class will simply upload a non-pow2-sized
  * image into a standard pow2-sized texture (without any special
- * scaling).  Since the choice of extension (or whether one is used at
+ * scaling).  
+ * Since the choice of extension (or whether one is used at
  * all) depends on the user's machine configuration, developers are
  * recommended to use {@link #getImageTexCoords} and {@link
  * #getSubImageTexCoords}, as those methods will calculate the
@@ -91,9 +105,12 @@ import com.jogamp.opengl.util.texture.spi.*;
  * when switching between textures it is necessary to call {@link
  * #bind}, but when drawing many triangles all using the same texture,
  * for best performance only one call to {@link #bind} should be made.
+ * User may also utilize multiple texture units,
+ * see <a href="#textureCallOrder"> order of texture commands above</a>. 
  *
  * <p><a name="premult"><b>Alpha premultiplication and blending</b></a>
- * <br> The mathematically correct way to perform blending in OpenGL
+ * <br/><i>Disclaimer: Consider performing alpha premultiplication in shader code, if really desired! Otherwise use RGBA.</i>
+ * <br/> The mathematically correct way to perform blending in OpenGL
  * (with the SrcOver "source over destination" mode, or any other
  * Porter-Duff rule) is to use "premultiplied color components", which
  * means the R/G/ B color components have already been multiplied by
@@ -138,9 +155,7 @@ import com.jogamp.opengl.util.texture.spi.*;
 <TR> <TD> AlphaXor <TD> GL_ONE_MINUS_DST_ALPHA  <TD> GL_ONE_MINUS_SRC_ALPHA
 </TABLE>
 </CENTER>
- *
- * @author Chris Campbell
- * @author Kenneth Russell
+ * @author Chris Campbell, Kenneth Russell, et.al.
  */
 public class Texture {
     /** The GL target type. */
diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/spi/PNGImage.java b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/PNGImage.java
index b4b00e744..93d37029e 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/texture/spi/PNGImage.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/PNGImage.java
@@ -177,7 +177,8 @@ public class PNGImage {
         }
         if(DEBUG) {
             System.err.println("PNGImage: "+imgInfo);
-            System.err.println("PNGImage: indexed "+indexed+", alpha "+hasAlpha+", channels "+channels+", bytesPerPixel "+bytesPerPixel+
+            System.err.println("PNGImage: indexed "+indexed+", alpha "+hasAlpha+", channels "+channels+"/"+imgInfo.channels+
+                               ", bytesPerPixel "+bytesPerPixel+"/"+imgInfo.bytesPixel+
                                ", pixels "+pixelWidth+"x"+pixelHeight+", dpi "+dpi[0]+"x"+dpi[1]+", glFormat 0x"+Integer.toHexString(glFormat));
         }
         
diff --git a/src/jogl/classes/javax/media/opengl/GLContext.java b/src/jogl/classes/javax/media/opengl/GLContext.java
index cc37da0ff..84d371ac6 100644
--- a/src/jogl/classes/javax/media/opengl/GLContext.java
+++ b/src/jogl/classes/javax/media/opengl/GLContext.java
@@ -131,16 +131,16 @@ public abstract class GLContext {
   /* Version 1.50, i.e. GLSL 1.50 for GL 3.2. */
   public static final VersionNumber Version150 = new VersionNumber(1, 50, 0);
   
-  /** Version 3.2. As an OpenGL version, it qualifies for geometry shader */
-  public static final VersionNumber Version32 = new VersionNumber(3, 2, 0);
+  /** Version 3.0. As an OpenGL version, it qualifies for desktop {@link #isGL2()} only, or ES 3.0. */
+  public static final VersionNumber Version300 = new VersionNumber(3, 0, 0);
   
   /** Version 3.1. As an OpenGL version, it qualifies for {@link #isGL3core()}, {@link #isGL3bc()} and {@link #isGL3()} */
-  public static final VersionNumber Version31 = new VersionNumber(3, 1, 0);
+  public static final VersionNumber Version310 = new VersionNumber(3, 1, 0);
   
-  /** Version 3.0. As an OpenGL version, it qualifies for {@link #isGL2()} only */
-  public static final VersionNumber Version30 = new VersionNumber(3, 0, 0);
+  /** Version 3.2. As an OpenGL version, it qualifies for geometry shader */
+  public static final VersionNumber Version320 = new VersionNumber(3, 2, 0);
   
-  protected static final VersionNumber Version80 = new VersionNumber(8, 0, 0);
+  protected static final VersionNumber Version800 = new VersionNumber(8, 0, 0);
 
   /** <code>ARB_create_context</code> related: created via ARB_create_context. Cache key value. See {@link #getAvailableContextProperties(AbstractGraphicsDevice, GLProfile)}. */
   protected static final int CTX_IS_ARB_CREATED  = 1 <<  0;
@@ -753,7 +753,7 @@ public abstract class GLContext {
           return "";
       }
       final int minor = ctxGLSLVersion.getMinor();
-      final String esSuffix = isGLES() && ctxGLSLVersion.compareTo(Version30) >= 0 ? " es" : ""; 
+      final String esSuffix = isGLES() && ctxGLSLVersion.compareTo(Version300) >= 0 ? " es" : ""; 
       return "#version " + ctxGLSLVersion.getMajor() + ( minor < 10 ? "0"+minor : minor ) + esSuffix + "\n" ;
   }
   
@@ -899,21 +899,21 @@ public abstract class GLContext {
   
   /** @see GLProfile#isGL3bc() */
   public final boolean isGL3bc() {
-      return ctxVersion.compareTo(Version31) >= 0
+      return ctxVersion.compareTo(Version310) >= 0
              && 0 != (ctxOptions & CTX_IS_ARB_CREATED)
              && 0 != (ctxOptions & CTX_PROFILE_COMPAT);
   }
 
   /** @see GLProfile#isGL3() */
   public final boolean isGL3() {
-      return ctxVersion.compareTo(Version31) >= 0
+      return ctxVersion.compareTo(Version310) >= 0
              && 0 != (ctxOptions & CTX_IS_ARB_CREATED)
              && 0 != (ctxOptions & (CTX_PROFILE_COMPAT|CTX_PROFILE_CORE));
   }
   
   /** Indicates whether this profile is capable of GL3 (core only). GL3 starts w/ OpenGL 3.1 <p>Includes [ GL4, GL3 ].</p> */
   public final boolean isGL3core() {
-      return ctxVersion.compareTo(Version31) >= 0
+      return ctxVersion.compareTo(Version310) >= 0
              && 0 != (ctxOptions & CTX_IS_ARB_CREATED)
              && 0 != (ctxOptions & CTX_PROFILE_CORE);
   }
diff --git a/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java b/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java
index b11f359be..d3f20b2e5 100644
--- a/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java
+++ b/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java
@@ -110,6 +110,7 @@ import com.jogamp.opengl.util.awt.AWTGLPixelBuffer.SingleAWTGLPixelBufferProvide
     <P>
     In case FBO is used and GLSL is available, a fragment shader is utilized
     to flip the FBO texture vertically. This hardware-accelerated step can be disabled via system property <code>jogl.gljpanel.noglsl</code>.
+    See <a href="#fboGLSLVerticalFlip">details here</a>.
     </P>
     <P>
     The OpenGL path is concluded by copying the rendered pixels an {@link BufferedImage} via {@link GL#glReadPixels(int, int, int, int, int, int, java.nio.Buffer) glReadPixels(..)}
@@ -125,8 +126,14 @@ import com.jogamp.opengl.util.awt.AWTGLPixelBuffer.SingleAWTGLPixelBufferProvide
     on the prepared {@link BufferedImage} as described above.
     </p>
     <P>
- *  Please read <A HREF="GLCanvas.html#java2dgl">Java2D OpenGL Remarks</A>.
+ *  Please read <a href="GLCanvas.html#java2dgl">Java2D OpenGL Remarks</a>.
  *  </P>
+ *  
+    <a name="fboGLSLVerticalFlip"><h5>FBO / GLSL Vertical Flip</h5></a>     
+    The FBO / GLSL code path uses one texture-unit and binds the FBO texture to it's active texture-target,
+    see {@link #setTextureUnit(int)} and {@link #getTextureUnit()}.
+    If the application uses the same texture-unit, ensure it setup their texture properly, i.e. texture-unit bind, enable and then it's parameters,
+    see {@link Texture#textureCallOrder Order of Texture Commands}.
 */
 
 @SuppressWarnings("serial")
@@ -212,6 +219,8 @@ public class GLJPanel extends JPanel implements AWTGLAutoDrawable, WindowClosing
   private int viewportX;
   private int viewportY;
 
+  private int requestedTextureUnit = 0; // default
+  
   // The backend in use
   private volatile Backend backend;
 
@@ -731,6 +740,40 @@ public class GLJPanel extends JPanel implements AWTGLAutoDrawable, WindowClosing
     return factory;
   }
 
+  /** 
+   * Returns the used texture unit, i.e. a value of [0..n], or -1 if non used.
+   * <p>
+   * If implementation uses a texture-unit, it will be known only after the first initialization, i.e. display call.
+   * </p> 
+   * <p>
+   * See <a href="#fboGLSLVerticalFlip">FBO / GLSL Vertical Flip</a>.
+   * </p>
+   */
+  public final int getTextureUnit() {
+    final Backend b = backend;
+    if ( null == b ) {
+        return -1;
+    }
+    return b.getTextureUnit();      
+  }
+  
+  /**
+   * Allows user to request a texture unit to be used,
+   * must be called before the first initialization, i.e. {@link #display()} call.
+   * <p>
+   * Defaults to <code>0</code>.
+   * </p>
+   * <p>
+   * See <a href="#fboGLSLVerticalFlip">FBO / GLSL Vertical Flip</a>.
+   * </p>
+   * 
+   * @param v requested texture unit
+   * @see #getTextureUnit()
+   */
+  public final void setTextureUnit(int v) {
+      requestedTextureUnit = v;
+  }
+  
   //----------------------------------------------------------------------
   // Internals only below this point
   //
@@ -947,6 +990,9 @@ public class GLJPanel extends JPanel implements AWTGLAutoDrawable, WindowClosing
     // Called to get the current backend's GLDrawable
     public GLDrawable getDrawable();
 
+    /** Returns the used texture unit, i.e. a value of [0..n], or -1 if non used. */
+    public int getTextureUnit();
+    
     // Called to fetch the "real" GLCapabilities for the backend
     public GLCapabilitiesImmutable getChosenGLCapabilities();
 
@@ -987,7 +1033,6 @@ public class GLJPanel extends JPanel implements AWTGLAutoDrawable, WindowClosing
     private GLDrawableImpl offscreenDrawable;
     private FBObject fboFlipped;
     private GLSLTextureRaster glslTextureRaster;
-    private final int fboTextureUnit = 0;
     
     private GLContextImpl offscreenContext;
     private boolean flipVertical;          
@@ -1035,12 +1080,13 @@ public class GLJPanel extends JPanel implements AWTGLAutoDrawable, WindowClosing
                   final boolean _autoSwapBufferMode = helper.getAutoSwapBufferMode();
                   helper.setAutoSwapBufferMode(false);
                   final GLFBODrawable fboDrawable = (GLFBODrawable) offscreenDrawable;
+                  fboDrawable.setTextureUnit( GLJPanel.this.requestedTextureUnit );
                   try {
                       fboFlipped = new FBObject();
                       fboFlipped.reset(gl, fboDrawable.getWidth(), fboDrawable.getHeight(), 0, false);
                       fboFlipped.attachTexture2D(gl, 0, chosenCaps.getAlphaBits()>0);
                       // fboFlipped.attachRenderbuffer(gl, Attachment.Type.DEPTH, 24);
-                      glslTextureRaster = new GLSLTextureRaster(fboTextureUnit, true);
+                      glslTextureRaster = new GLSLTextureRaster(fboDrawable.getTextureUnit(), true);
                       glslTextureRaster.init(gl.getGL2ES2());
                       glslTextureRaster.reshape(gl.getGL2ES2(), 0, 0, fboDrawable.getWidth(), fboDrawable.getHeight());
                   } catch (Exception ex) {
@@ -1210,7 +1256,7 @@ public class GLJPanel extends JPanel implements AWTGLAutoDrawable, WindowClosing
             fboDrawable.swapBuffers();
             fboFlipped.bind(gl);
             
-            // gl.glActiveTexture(fboDrawable.getTextureUnit()); // implicit!
+            // gl.glActiveTexture(GL.GL_TEXTURE0 + fboDrawable.getTextureUnit()); // implicit by GLFBODrawableImpl: swapBuffers/contextMadeCurent -> swapFBOImpl
             gl.glBindTexture(GL.GL_TEXTURE_2D, fboTex.getName());
             // gl.glClear(GL.GL_DEPTH_BUFFER_BIT); // fboFlipped runs w/o DEPTH!
             glslTextureRaster.display(gl.getGL2ES2());
@@ -1244,6 +1290,14 @@ public class GLJPanel extends JPanel implements AWTGLAutoDrawable, WindowClosing
         // correctness on all platforms
       }
     }
+    
+    @Override
+    public int getTextureUnit() {
+        if(null != glslTextureRaster && null != offscreenDrawable) { // implies flippedVertical
+            return ((GLFBODrawable)offscreenDrawable).getTextureUnit();
+        }
+        return -1;
+    }
 
     @Override
     public void doPaintComponent(Graphics g) {
@@ -1446,6 +1500,9 @@ public class GLJPanel extends JPanel implements AWTGLAutoDrawable, WindowClosing
     }
 
     @Override
+    public int getTextureUnit() { return -1; }
+    
+    @Override
     public GLCapabilitiesImmutable getChosenGLCapabilities() {
       // FIXME: should do better than this; is it possible to using only platform-independent code?
       return new GLCapabilities(null);
diff --git a/src/jogl/classes/jogamp/opengl/GLContextImpl.java b/src/jogl/classes/jogamp/opengl/GLContextImpl.java
index fea2c24a8..b76ba866c 100644
--- a/src/jogl/classes/jogamp/opengl/GLContextImpl.java
+++ b/src/jogl/classes/jogamp/opengl/GLContextImpl.java
@@ -671,7 +671,7 @@ public abstract class GLContextImpl extends GLContext {
                 if( 0 == ( ctxOptions & GLContext.CTX_PROFILE_ES) ) {   // not ES profile
                     final int reqMajor;
                     final int reqProfile;
-                    if( ctxVersion.compareTo(Version30) <= 0 ) {
+                    if( ctxVersion.compareTo(Version300) <= 0 ) {
                         reqMajor = 2;
                     } else {
                         reqMajor = ctxVersion.getMajor();
@@ -1605,7 +1605,7 @@ public abstract class GLContextImpl extends GLContext {
             //
             final int quirk = GLRendererQuirks.DontCloseX11Display;
             if( glRenderer.contains(MesaSP) ) {
-                if ( glRenderer.contains("X11") && vendorVersion.compareTo(Version80) < 0 ) {
+                if ( glRenderer.contains("X11") && vendorVersion.compareTo(Version800) < 0 ) {
                     if(DEBUG) {
                         System.err.println("Quirk: "+GLRendererQuirks.toString(quirk)+": cause: X11 Renderer=" + glRenderer + ", Version=[vendor " + vendorVersion + ", GL " + glVersion+"]");
                     }
diff --git a/src/jogl/classes/jogamp/opengl/GLVersionNumber.java b/src/jogl/classes/jogamp/opengl/GLVersionNumber.java
index cea3ac4ab..e4187b35b 100644
--- a/src/jogl/classes/jogamp/opengl/GLVersionNumber.java
+++ b/src/jogl/classes/jogamp/opengl/GLVersionNumber.java
@@ -110,7 +110,7 @@ public class GLVersionNumber extends VersionNumberString {
         String str;
         {
             final GLVersionNumber glv = create(versionString);
-            str = versionString.substring(glv.endOfStringMatch());
+            str = versionString.substring(glv.endOfStringMatch()).trim();
         }
         
         while ( str.length() > 0 ) {
@@ -120,7 +120,7 @@ public class GLVersionNumber extends VersionNumberString {
                 if( version.hasMajor() && version.hasMinor() ) { // Requires at least a defined major and minor version component!
                     return version;
                 }
-                str = str.substring( eosm );
+                str = str.substring( eosm ).trim();
             } else {
                 break; // no match
             }
diff --git a/src/jogl/classes/jogamp/opengl/util/pngj/FilterType.java b/src/jogl/classes/jogamp/opengl/util/pngj/FilterType.java
index e88a95a33..0fffc85b1 100644
--- a/src/jogl/classes/jogamp/opengl/util/pngj/FilterType.java
+++ b/src/jogl/classes/jogamp/opengl/util/pngj/FilterType.java
@@ -1,5 +1,7 @@
 package jogamp.opengl.util.pngj;

 

+import java.util.HashMap;

+

 /**

  * Internal PNG predictor filter, or strategy to select it.

  * 

@@ -26,15 +28,18 @@ public enum FilterType {
 	 */

 	FILTER_PAETH(4),

 	/**

-	 * Default strategy: select one of the above filters depending on global image parameters

+	 * Default strategy: select one of the above filters depending on global

+	 * image parameters

 	 */

 	FILTER_DEFAULT(-1),

 	/**

-	 * Aggressive strategy: select one of the above filters trying each of the filters (every 8 rows)

+	 * Aggressive strategy: select one of the above filters trying each of the

+	 * filters (every 8 rows)

 	 */

 	FILTER_AGGRESSIVE(-2),

 	/**

-	 * Very aggressive strategy: select one of the above filters trying each of the filters (for every row!)

+	 * Very aggressive strategy: select one of the above filters trying each of

+	 * the filters (for every row!)

 	 */

 	FILTER_VERYAGGRESSIVE(-3),

 	/**

@@ -52,12 +57,17 @@ public enum FilterType {
 		this.val = val;

 	}

 

-	public static FilterType getByVal(int i) {

+	private static HashMap<Integer, FilterType> byVal;

+

+	static {

+		byVal = new HashMap<Integer, FilterType>();

 		for (FilterType ft : values()) {

-			if (ft.val == i)

-				return ft;

+			byVal.put(ft.val, ft);

 		}

-		return null;

+	}

+

+	public static FilterType getByVal(int i) {

+		return byVal.get(i);

 	}

 

 }

diff --git a/src/jogl/classes/jogamp/opengl/util/pngj/ImageInfo.java b/src/jogl/classes/jogamp/opengl/util/pngj/ImageInfo.java
index 26562ef3e..e62134cd5 100644
--- a/src/jogl/classes/jogamp/opengl/util/pngj/ImageInfo.java
+++ b/src/jogl/classes/jogamp/opengl/util/pngj/ImageInfo.java
@@ -3,7 +3,8 @@ package jogamp.opengl.util.pngj;
 /**

  * Simple immutable wrapper for basic image info.

  * <p>

- * Some parameters are redundant, but the constructor receives an 'orthogonal' subset.

+ * Some parameters are redundant, but the constructor receives an 'orthogonal'

+ * subset.

  * <p>

  * ref: http://www.w3.org/TR/PNG/#11IHDR

  */

@@ -23,14 +24,15 @@ public class ImageInfo {
 	public final int rows;

 

 	/**

-	 * Bits per sample (per channel) in the buffer (1-2-4-8-16). This is 8-16 for RGB/ARGB images, 1-2-4-8 for

-	 * grayscale. For indexed images, number of bits per palette index (1-2-4-8)

+	 * Bits per sample (per channel) in the buffer (1-2-4-8-16). This is 8-16

+	 * for RGB/ARGB images, 1-2-4-8 for grayscale. For indexed images, number of

+	 * bits per palette index (1-2-4-8)

 	 */

 	public final int bitDepth;

 

 	/**

-	 * Number of channels, as used internally: 3 for RGB, 4 for RGBA, 2 for GA (gray with alpha), 1 for grayscale or

-	 * indexed.

+	 * Number of channels, as used internally: 3 for RGB, 4 for RGBA, 2 for GA

+	 * (gray with alpha), 1 for grayscale or indexed.

 	 */

 	public final int channels;

 

@@ -50,7 +52,8 @@ public class ImageInfo {
 	public final boolean indexed;

 

 	/**

-	 * Flag: true if image internally uses less than one byte per sample (bit depth 1-2-4)

+	 * Flag: true if image internally uses less than one byte per sample (bit

+	 * depth 1-2-4)

 	 */

 	public final boolean packed;

 

@@ -75,10 +78,12 @@ public class ImageInfo {
 	public final int samplesPerRow;

 

 	/**

-	 * Amount of "packed samples" : when several samples are stored in a single byte (bitdepth 1,2 4) they are counted

-	 * as one "packed sample". This is less that samplesPerRow only when bitdepth is 1-2-4 (flag packed = true)

+	 * Amount of "packed samples" : when several samples are stored in a single

+	 * byte (bitdepth 1,2 4) they are counted as one "packed sample". This is

+	 * less that samplesPerRow only when bitdepth is 1-2-4 (flag packed = true)

 	 * <p>

-	 * This equals the number of elements in the scanline array if working with packedMode=true

+	 * This equals the number of elements in the scanline array if working with

+	 * packedMode=true

 	 * <p>

 	 * For internal use, client code should rarely access this.

 	 */

@@ -99,7 +104,8 @@ public class ImageInfo {
 	 * @param rows

 	 *            Height in pixels

 	 * @param bitdepth

-	 *            Bits per sample, in the buffer : 8-16 for RGB true color and greyscale

+	 *            Bits per sample, in the buffer : 8-16 for RGB true color and

+	 *            greyscale

 	 * @param alpha

 	 *            Flag: has an alpha channel (RGBA or GA)

 	 * @param grayscale

diff --git a/src/jogl/classes/jogamp/opengl/util/pngj/ImageLine.java b/src/jogl/classes/jogamp/opengl/util/pngj/ImageLine.java
index 9f8a13230..e34e6a226 100644
--- a/src/jogl/classes/jogamp/opengl/util/pngj/ImageLine.java
+++ b/src/jogl/classes/jogamp/opengl/util/pngj/ImageLine.java
@@ -5,7 +5,8 @@ import jogamp.opengl.util.pngj.ImageLineHelper.ImageLineStats;
 /**

  * Lightweight wrapper for an image scanline, used for read and write.

  * <p>

- * This object can be (usually it is) reused while iterating over the image lines.

+ * This object can be (usually it is) reused while iterating over the image

+ * lines.

  * <p>

  * See <code>scanline</code> field, to understand the format.

  */

@@ -18,21 +19,25 @@ public class ImageLine {
 	private int rown = 0;

 

 	/**

-	 * The 'scanline' is an array of integers, corresponds to an image line (row).

+	 * The 'scanline' is an array of integers, corresponds to an image line

+	 * (row).

 	 * <p>

-	 * Except for 'packed' formats (gray/indexed with 1-2-4 bitdepth) each <code>int</code> is a "sample" (one for

-	 * channel), (0-255 or 0-65535) in the corresponding PNG sequence: <code>R G B R G B...</code> or

+	 * Except for 'packed' formats (gray/indexed with 1-2-4 bitdepth) each

+	 * <code>int</code> is a "sample" (one for channel), (0-255 or 0-65535) in

+	 * the corresponding PNG sequence: <code>R G B R G B...</code> or

 	 * <code>R G B A R G B A...</tt> 

 	 * or <code>g g g ...</code> or <code>i i i</code> (palette index)

 	 * <p>

-	 * For bitdepth=1/2/4 , and if samplesUnpacked=false, each value is a PACKED byte!

+	 * For bitdepth=1/2/4 , and if samplesUnpacked=false, each value is a PACKED

+	 * byte!

 	 * <p>

-	 * To convert a indexed line to RGB balues, see <code>ImageLineHelper.palIdx2RGB()</code> (you can't do the reverse)

+	 * To convert a indexed line to RGB balues, see

+	 * <code>ImageLineHelper.palIdx2RGB()</code> (you can't do the reverse)

 	 */

 	public final int[] scanline;

 	/**

-	 * Same as {@link #scanline}, but with one byte per sample. Only one of scanline and scanlineb is valid - this

-	 * depends on {@link #sampleType}

+	 * Same as {@link #scanline}, but with one byte per sample. Only one of

+	 * scanline and scanlineb is valid - this depends on {@link #sampleType}

 	 */

 	public final byte[] scanlineb;

 

@@ -53,10 +58,11 @@ public class ImageLine {
 	public final SampleType sampleType;

 

 	/**

-	 * true: each element of the scanline array represents a sample always, even for internally packed PNG formats

+	 * true: each element of the scanline array represents a sample always, even

+	 * for internally packed PNG formats

 	 * 

-	 * false: if the original image was of packed type (bit depth less than 8) we keep samples packed in a single array

-	 * element

+	 * false: if the original image was of packed type (bit depth less than 8)

+	 * we keep samples packed in a single array element

 	 */

 	public final boolean samplesUnpacked;

 

@@ -70,11 +76,14 @@ public class ImageLine {
 	/**

 	 * 

 	 * @param imgInfo

-	 *            Inmutable ImageInfo, basic parameter of the image we are reading or writing

+	 *            Inmutable ImageInfo, basic parameter of the image we are

+	 *            reading or writing

 	 * @param stype

-	 *            INT or BYTE : this determines which scanline is the really used one

+	 *            INT or BYTE : this determines which scanline is the really

+	 *            used one

 	 * @param unpackedMode

-	 *            If true, we use unpacked format, even for packed original images

+	 *            If true, we use unpacked format, even for packed original

+	 *            images

 	 * 

 	 */

 	public ImageLine(ImageInfo imgInfo, SampleType stype, boolean unpackedMode) {

@@ -226,7 +235,10 @@ public class ImageLine {
 		}

 	}

 

-	/** size original: samplesPerRow sizeFinal: samplesPerRowPacked (trailing elements are trash!) **/

+	/**

+	 * size original: samplesPerRow sizeFinal: samplesPerRowPacked (trailing

+	 * elements are trash!)

+	 **/

 	static void packInplaceByte(final ImageInfo iminfo, final byte[] src, final byte[] dst, final boolean scaled) {

 		final int bitDepth = iminfo.bitDepth;

 		if (bitDepth >= 8)

diff --git a/src/jogl/classes/jogamp/opengl/util/pngj/ImageLineHelper.java b/src/jogl/classes/jogamp/opengl/util/pngj/ImageLineHelper.java
index 98f235662..91516a704 100644
--- a/src/jogl/classes/jogamp/opengl/util/pngj/ImageLineHelper.java
+++ b/src/jogl/classes/jogamp/opengl/util/pngj/ImageLineHelper.java
@@ -5,11 +5,14 @@ import jogamp.opengl.util.pngj.chunks.PngChunkPLTE;
 import jogamp.opengl.util.pngj.chunks.PngChunkTRNS;

 

 /**

- * Bunch of utility static methods to process/analyze an image line at the pixel level.

+ * Bunch of utility static methods to process/analyze an image line at the pixel

+ * level.

  * <p>

- * Not essential at all, some methods are probably to be removed if future releases.

+ * Not essential at all, some methods are probably to be removed if future

+ * releases.

  * <p>

- * WARNING: most methods for getting/setting values work currently only for integer base imageLines

+ * WARNING: most methods for getting/setting values work currently only for

+ * integer base imageLines

  */

 public class ImageLineHelper {

 

@@ -18,7 +21,8 @@ public class ImageLineHelper {
 	private final static double BIG_VALUE_NEG = Double.MAX_VALUE * (-0.5);

 

 	/**

-	 * Given an indexed line with a palette, unpacks as a RGB array, or RGBA if a non nul PngChunkTRNS chunk is passed

+	 * Given an indexed line with a palette, unpacks as a RGB array, or RGBA if

+	 * a non nul PngChunkTRNS chunk is passed

 	 * 

 	 * @param line

 	 *            ImageLine as returned from PngReader

@@ -26,7 +30,8 @@ public class ImageLineHelper {
 	 *            Palette chunk

 	 * @param buf

 	 *            Preallocated array, optional

-	 * @return R G B (A), one sample 0-255 per array element. Ready for pngw.writeRowInt()

+	 * @return R G B (A), one sample 0-255 per array element. Ready for

+	 *         pngw.writeRowInt()

 	 */

 	public static int[] palette2rgb(ImageLine line, PngChunkPLTE pal, PngChunkTRNS trns, int[] buf) {

 		boolean isalpha = trns != null;

@@ -53,9 +58,12 @@ public class ImageLineHelper {
 		return palette2rgb(line, pal, null, buf);

 	}

 

-	/** what follows is pretty uninteresting/untested/obsolete, subject to change */

 	/**

-	 * Just for basic info or debugging. Shows values for first and last pixel. Does not include alpha

+	 * what follows is pretty uninteresting/untested/obsolete, subject to change

+	 */

+	/**

+	 * Just for basic info or debugging. Shows values for first and last pixel.

+	 * Does not include alpha

 	 */

 	public static String infoFirstLastPixels(ImageLine line) {

 		return line.imgInfo.channels == 1 ? String.format("first=(%d) last=(%d)", line.scanline[0],

@@ -71,8 +79,8 @@ public class ImageLineHelper {
 	}

 

 	/**

-	 * Computes some statistics for the line. Not very efficient or elegant, mainly for tests. Only for RGB/RGBA Outputs

-	 * values as doubles (0.0 - 1.0)

+	 * Computes some statistics for the line. Not very efficient or elegant,

+	 * mainly for tests. Only for RGB/RGBA Outputs values as doubles (0.0 - 1.0)

 	 */

 	static class ImageLineStats {

 		public double[] prom = { 0.0, 0.0, 0.0, 0.0 }; // channel averages

@@ -237,9 +245,11 @@ public class ImageLineHelper {
 	/**

 	 * Unpacks scanline (for bitdepth 1-2-4) into a array <code>int[]</code>

 	 * <p>

-	 * You can (OPTIONALLY) pass an preallocated array, that will be filled and returned. If null, it will be allocated

+	 * You can (OPTIONALLY) pass an preallocated array, that will be filled and

+	 * returned. If null, it will be allocated

 	 * <p>

-	 * If <code>scale==true<code>, it scales the value (just a bit shift) towards 0-255.

+	 * If

+	 * <code>scale==true<code>, it scales the value (just a bit shift) towards 0-255.

 	 * <p>

 	 * You probably should use {@link ImageLine#unpackToNewImageLine()}

 	 * 

diff --git a/src/jogl/classes/jogamp/opengl/util/pngj/ImageLines.java b/src/jogl/classes/jogamp/opengl/util/pngj/ImageLines.java
index 1e0ab746a..feb50e7b6 100644
--- a/src/jogl/classes/jogamp/opengl/util/pngj/ImageLines.java
+++ b/src/jogl/classes/jogamp/opengl/util/pngj/ImageLines.java
@@ -3,10 +3,12 @@ package jogamp.opengl.util.pngj;
 import jogamp.opengl.util.pngj.ImageLine.SampleType;
 
 /**
- * Wraps in a matrix a set of image rows, not necessarily contiguous - but equispaced.
+ * Wraps in a matrix a set of image rows, not necessarily contiguous - but
+ * equispaced.
  * 
- * The fields mirrors those of {@link ImageLine}, and you can access each row as a ImageLine backed by the matrix row,
- * see {@link #getImageLineAtMatrixRow(int)}
+ * The fields mirrors those of {@link ImageLine}, and you can access each row as
+ * a ImageLine backed by the matrix row, see
+ * {@link #getImageLineAtMatrixRow(int)}
  */
 public class ImageLines {
 
@@ -23,7 +25,8 @@ public class ImageLines {
 	public final byte[][] scanlinesb;
 
 	/**
-	 * Allocates a matrix to store {@code nRows} image rows. See {@link ImageLine} and {@link PngReader#readRowsInt()}
+	 * Allocates a matrix to store {@code nRows} image rows. See
+	 * {@link ImageLine} and {@link PngReader#readRowsInt()}
 	 * {@link PngReader#readRowsByte()}
 	 * 
 	 * @param imgInfo
@@ -54,8 +57,9 @@ public class ImageLines {
 	}
 
 	/**
-	 * Warning: this always returns a valid matrix row (clamping on 0 : nrows-1, and rounding down) Eg:
-	 * rowOffset=4,rowStep=2 imageRowToMatrixRow(17) returns 6 , imageRowToMatrixRow(1) returns 0
+	 * Warning: this always returns a valid matrix row (clamping on 0 : nrows-1,
+	 * and rounding down) Eg: rowOffset=4,rowStep=2 imageRowToMatrixRow(17)
+	 * returns 6 , imageRowToMatrixRow(1) returns 0
 	 */
 	public int imageRowToMatrixRow(int imrow) {
 		int r = (imrow - rowOffset) / rowStep;
@@ -86,9 +90,11 @@ public class ImageLines {
 	 * Returns a ImageLine is backed by the matrix, no allocation done
 	 * 
 	 * @param mrow
-	 *            Matrix row, from 0 to nRows This is not necessarily the image row, see
-	 *            {@link #imageRowToMatrixRow(int)} and {@link #matrixRowToImageRow(int)}
-	 * @return A new ImageLine, backed by the matrix, with the correct ('real') rownumber
+	 *            Matrix row, from 0 to nRows This is not necessarily the image
+	 *            row, see {@link #imageRowToMatrixRow(int)} and
+	 *            {@link #matrixRowToImageRow(int)}
+	 * @return A new ImageLine, backed by the matrix, with the correct ('real')
+	 *         rownumber
 	 */
 	public ImageLine getImageLineAtMatrixRow(int mrow) {
 		if (mrow < 0 || mrow > nRows)
diff --git a/src/jogl/classes/jogamp/opengl/util/pngj/PngHelperInternal.java b/src/jogl/classes/jogamp/opengl/util/pngj/PngHelperInternal.java
index 63edf8d17..a950c6b33 100644
--- a/src/jogl/classes/jogamp/opengl/util/pngj/PngHelperInternal.java
+++ b/src/jogl/classes/jogamp/opengl/util/pngj/PngHelperInternal.java
@@ -144,18 +144,23 @@ public class PngHelperInternal {
 		}

 	}

 

-	public static void skipBytes(InputStream is, int len) {

-		byte[] buf = new byte[8192 * 4];

-		int read, remain = len;

+	public static void skipBytes(InputStream is, long len) {

 		try {

-			while (remain > 0) {

-				read = is.read(buf, 0, remain > buf.length ? buf.length : remain);

-				if (read < 0)

-					throw new PngjInputException("error reading (skipping) : EOF");

-				remain -= read;

+			while (len > 0) {

+				long n1 = is.skip(len);

+				if (n1 > 0) {

+					len -= n1;

+				} else if (n1 == 0) { // should we retry? lets read one byte

+					if (is.read() == -1) // EOF

+						break;

+					else

+						len--;

+				} else

+					// negative? this should never happen but...

+					throw new IOException("skip() returned a negative value ???");

 			}

 		} catch (IOException e) {

-			throw new PngjInputException("error reading (skipping)", e);

+			throw new PngjInputException(e);

 		}

 	}

 

diff --git a/src/jogl/classes/jogamp/opengl/util/pngj/PngIDatChunkInputStream.java b/src/jogl/classes/jogamp/opengl/util/pngj/PngIDatChunkInputStream.java
index 6cc39b0e6..cdad09809 100644
--- a/src/jogl/classes/jogamp/opengl/util/pngj/PngIDatChunkInputStream.java
+++ b/src/jogl/classes/jogamp/opengl/util/pngj/PngIDatChunkInputStream.java
@@ -37,7 +37,8 @@ class PngIDatChunkInputStream extends InputStream {
 	List<IdatChunkInfo> foundChunksInfo = new ArrayList<IdatChunkInfo>();

 

 	/**

-	 * Constructor must be called just after reading length and id of first IDAT chunk

+	 * Constructor must be called just after reading length and id of first IDAT

+	 * chunk

 	 **/

 	PngIDatChunkInputStream(InputStream iStream, int lenFirstChunk, long offset) {

 		this.offset = offset;

@@ -95,7 +96,8 @@ class PngIDatChunkInputStream extends InputStream {
 	}

 

 	/**

-	 * sometimes last row read does not fully consumes the chunk here we read the reamaing dummy bytes

+	 * sometimes last row read does not fully consumes the chunk here we read

+	 * the reamaing dummy bytes

 	 */

 	void forceChunkEnd() {

 		if (!ended) {

@@ -108,7 +110,8 @@ class PngIDatChunkInputStream extends InputStream {
 	}

 

 	/**

-	 * This can return less than len, but never 0 Returns -1 if "pseudo file" ended prematurely. That is our error.

+	 * This can return less than len, but never 0 Returns -1 if "pseudo file"

+	 * ended prematurely. That is our error.

 	 */

 	@Override

 	public int read(byte[] b, int off, int len) throws IOException {

diff --git a/src/jogl/classes/jogamp/opengl/util/pngj/PngWriter.java b/src/jogl/classes/jogamp/opengl/util/pngj/PngWriter.java
index 601cd96c0..3e684a881 100644
--- a/src/jogl/classes/jogamp/opengl/util/pngj/PngWriter.java
+++ b/src/jogl/classes/jogamp/opengl/util/pngj/PngWriter.java
@@ -83,8 +83,9 @@ public class PngWriter {
 	}

 

 	/**

-	 * Constructs a new PngWriter from a output stream. After construction nothing is writen yet. You still can set some

-	 * parameters (compression, filters) and queue chunks before start writing the pixels.

+	 * Constructs a new PngWriter from a output stream. After construction

+	 * nothing is writen yet. You still can set some parameters (compression,

+	 * filters) and queue chunks before start writing the pixels.

 	 * <p>

 	 * See also <code>FileHelper.createPngWriter()</code> if available.

 	 * 

@@ -418,13 +419,15 @@ public class PngWriter {
 	/**

 	 * Copies first (pre IDAT) ancillary chunks from a PngReader.

 	 * <p>

-	 * Should be called when creating an image from another, before starting writing lines, to copy relevant chunks.

+	 * Should be called when creating an image from another, before starting

+	 * writing lines, to copy relevant chunks.

 	 * <p>

 	 * 

 	 * @param reader

 	 *            : PngReader object, already opened.

 	 * @param copy_mask

-	 *            : Mask bit (OR), see <code>ChunksToWrite.COPY_XXX</code> constants

+	 *            : Mask bit (OR), see <code>ChunksToWrite.COPY_XXX</code>

+	 *            constants

 	 */

 	public void copyChunksFirst(PngReader reader, int copy_mask) {

 		copyChunks(reader, copy_mask, false);

@@ -433,14 +436,15 @@ public class PngWriter {
 	/**

 	 * Copies last (post IDAT) ancillary chunks from a PngReader.

 	 * <p>

-	 * Should be called when creating an image from another, after writing all lines, before closing the writer, to copy

-	 * additional chunks.

+	 * Should be called when creating an image from another, after writing all

+	 * lines, before closing the writer, to copy additional chunks.

 	 * <p>

 	 * 

 	 * @param reader

 	 *            : PngReader object, already opened and fully read.

 	 * @param copy_mask

-	 *            : Mask bit (OR), see <code>ChunksToWrite.COPY_XXX</code> constants

+	 *            : Mask bit (OR), see <code>ChunksToWrite.COPY_XXX</code>

+	 *            constants

 	 */

 	public void copyChunksLast(PngReader reader, int copy_mask) {

 		copyChunks(reader, copy_mask, true);

@@ -449,8 +453,8 @@ public class PngWriter {
 	/**

 	 * Computes compressed size/raw size, approximate.

 	 * <p>

-	 * Actually: compressed size = total size of IDAT data , raw size = uncompressed pixel bytes = rows * (bytesPerRow +

-	 * 1).

+	 * Actually: compressed size = total size of IDAT data , raw size =

+	 * uncompressed pixel bytes = rows * (bytesPerRow + 1).

 	 * 

 	 * This must be called after pngw.end()

 	 */

@@ -463,7 +467,8 @@ public class PngWriter {
 	}

 

 	/**

-	 * Finalizes the image creation and closes the stream. This MUST be called after writing the lines.

+	 * Finalizes the image creation and closes the stream. This MUST be called

+	 * after writing the lines.

 	 */

 	public void end() {

 		if (rowNum != imgInfo.rows - 1)

@@ -525,15 +530,17 @@ public class PngWriter {
 	 * See also setCompLevel()

 	 * 

 	 * @param filterType

-	 *            One of the five prediction types or strategy to choose it (see <code>PngFilterType</code>) Recommended

-	 *            values: DEFAULT (default) or AGGRESIVE

+	 *            One of the five prediction types or strategy to choose it (see

+	 *            <code>PngFilterType</code>) Recommended values: DEFAULT

+	 *            (default) or AGGRESIVE

 	 */

 	public void setFilterType(FilterType filterType) {

 		filterStrat = new FilterWriteStrategy(imgInfo, filterType);

 	}

 

 	/**

-	 * Sets maximum size of IDAT fragments. This has little effect on performance you should rarely call this

+	 * Sets maximum size of IDAT fragments. This has little effect on

+	 * performance you should rarely call this

 	 * <p>

 	 * 

 	 * @param idatMaxSize

@@ -553,7 +560,8 @@ public class PngWriter {
 	}

 

 	/**

-	 * Deflater strategy: one of Deflater.FILTERED Deflater.HUFFMAN_ONLY Deflater.DEFAULT_STRATEGY

+	 * Deflater strategy: one of Deflater.FILTERED Deflater.HUFFMAN_ONLY

+	 * Deflater.DEFAULT_STRATEGY

 	 * <p>

 	 * Default: Deflater.FILTERED . This should be changed very rarely.

 	 */

@@ -562,8 +570,8 @@ public class PngWriter {
 	}

 

 	/**

-	 * Writes line, checks that the row number is consistent with that of the ImageLine See writeRow(int[] newrow, int

-	 * rown)

+	 * Writes line, checks that the row number is consistent with that of the

+	 * ImageLine See writeRow(int[] newrow, int rown)

 	 * 

 	 * @deprecated Better use writeRow(ImageLine imgline, int rownumber)

 	 */

@@ -607,18 +615,22 @@ public class PngWriter {
 	/**

 	 * Writes a full image row.

 	 * <p>

-	 * This must be called sequentially from n=0 to n=rows-1 One integer per sample , in the natural order: R G B R G B

-	 * ... (or R G B A R G B A... if has alpha) The values should be between 0 and 255 for 8 bitspc images, and between

-	 * 0- 65535 form 16 bitspc images (this applies also to the alpha channel if present) The array can be reused.

+	 * This must be called sequentially from n=0 to n=rows-1 One integer per

+	 * sample , in the natural order: R G B R G B ... (or R G B A R G B A... if

+	 * has alpha) The values should be between 0 and 255 for 8 bitspc images,

+	 * and between 0- 65535 form 16 bitspc images (this applies also to the

+	 * alpha channel if present) The array can be reused.

 	 * <p>

-	 * Warning: the array might be modified in some cases (unpacked row with low bitdepth)

+	 * Warning: the array might be modified in some cases (unpacked row with low

+	 * bitdepth)

 	 * <p>

 	 * 

 	 * @param newrow

-	 *            Array of pixel values. Warning: the array size should be exact (samplesPerRowP)

+	 *            Array of pixel values. Warning: the array size should be exact

+	 *            (samplesPerRowP)

 	 * @param rown

-	 *            Row number, from 0 (top) to rows-1 (bottom). This is just used as a check. Pass -1 if you want to

-	 *            autocompute it

+	 *            Row number, from 0 (top) to rows-1 (bottom). This is just used

+	 *            as a check. Pass -1 if you want to autocompute it

 	 */

 	public void writeRowInt(int[] newrow, int rown) {

 		prepareEncodeRow(rown);

@@ -627,8 +639,9 @@ public class PngWriter {
 	}

 

 	/**

-	 * Same semantics as writeRowInt but using bytes. Each byte is still a sample. If 16bitdepth, we are passing only

-	 * the most significant byte (and hence losing some info)

+	 * Same semantics as writeRowInt but using bytes. Each byte is still a

+	 * sample. If 16bitdepth, we are passing only the most significant byte (and

+	 * hence losing some info)

 	 * 

 	 * @see PngWriter#writeRowInt(int[], int)

 	 */

@@ -659,12 +672,15 @@ public class PngWriter {
 	}

 

 	/**

-	 * If false (default), and image has bitdepth 1-2-4, the scanlines passed are assumed to be already packed.

+	 * If false (default), and image has bitdepth 1-2-4, the scanlines passed

+	 * are assumed to be already packed.

 	 * <p>

-	 * If true, each element is a sample, the writer will perform the packing if necessary.

+	 * If true, each element is a sample, the writer will perform the packing if

+	 * necessary.

 	 * <p>

-	 * Warning: when using {@link #writeRow(ImageLine, int)} (recommended) the <tt>packed</tt> flag of the ImageLine

-	 * object overrides (and overwrites!) this field.

+	 * Warning: when using {@link #writeRow(ImageLine, int)} (recommended) the

+	 * <tt>packed</tt> flag of the ImageLine object overrides (and overwrites!)

+	 * this field.

 	 */

 	public void setUseUnPackedMode(boolean useUnpackedMode) {

 		this.unpackedMode = useUnpackedMode;

diff --git a/src/jogl/classes/jogamp/opengl/util/pngj/PngjExceptionInternal.java b/src/jogl/classes/jogamp/opengl/util/pngj/PngjExceptionInternal.java
index 963abc50e..c429b893b 100644
--- a/src/jogl/classes/jogamp/opengl/util/pngj/PngjExceptionInternal.java
+++ b/src/jogl/classes/jogamp/opengl/util/pngj/PngjExceptionInternal.java
@@ -1,7 +1,8 @@
 package jogamp.opengl.util.pngj;

 

 /**

- * Exception for anomalous internal problems (sort of asserts) that point to some issue with the library

+ * Exception for anomalous internal problems (sort of asserts) that point to

+ * some issue with the library

  * 

  * @author Hernan J Gonzalez

  * 

diff --git a/src/jogl/classes/jogamp/opengl/util/pngj/PngjUnsupportedException.java b/src/jogl/classes/jogamp/opengl/util/pngj/PngjUnsupportedException.java
index 0801e33bb..f68458d19 100644
--- a/src/jogl/classes/jogamp/opengl/util/pngj/PngjUnsupportedException.java
+++ b/src/jogl/classes/jogamp/opengl/util/pngj/PngjUnsupportedException.java
@@ -1,7 +1,8 @@
 package jogamp.opengl.util.pngj;

 

 /**

- * Exception thrown because of some valid feature of PNG standard that this library does not support

+ * Exception thrown because of some valid feature of PNG standard that this

+ * library does not support

  */

 public class PngjUnsupportedException extends RuntimeException {

 	private static final long serialVersionUID = 1L;

diff --git a/src/jogl/classes/jogamp/opengl/util/pngj/ProgressiveOutputStream.java b/src/jogl/classes/jogamp/opengl/util/pngj/ProgressiveOutputStream.java
index a5bad666c..4516a0886 100644
--- a/src/jogl/classes/jogamp/opengl/util/pngj/ProgressiveOutputStream.java
+++ b/src/jogl/classes/jogamp/opengl/util/pngj/ProgressiveOutputStream.java
@@ -4,7 +4,8 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;

 

 /**

- * stream that outputs to memory and allows to flush fragments every 'size' bytes to some other destination

+ * stream that outputs to memory and allows to flush fragments every 'size'

+ * bytes to some other destination

  */

 abstract class ProgressiveOutputStream extends ByteArrayOutputStream {

 	private final int size;

@@ -50,8 +51,8 @@ abstract class ProgressiveOutputStream extends ByteArrayOutputStream {
 	}

 

 	/**

-	 * if it's time to flush data (or if forced==true) calls abstract method flushBuffer() and cleans those bytes from

-	 * own buffer

+	 * if it's time to flush data (or if forced==true) calls abstract method

+	 * flushBuffer() and cleans those bytes from own buffer

 	 */

 	private final void checkFlushBuffer(boolean forced) {

 		while (forced || count >= size) {

diff --git a/src/jogl/classes/jogamp/opengl/util/pngj/chunks/ChunkLoadBehaviour.java b/src/jogl/classes/jogamp/opengl/util/pngj/chunks/ChunkLoadBehaviour.java
index 03d50c2c4..82ab3bcf9 100644
--- a/src/jogl/classes/jogamp/opengl/util/pngj/chunks/ChunkLoadBehaviour.java
+++ b/src/jogl/classes/jogamp/opengl/util/pngj/chunks/ChunkLoadBehaviour.java
@@ -1,7 +1,8 @@
 package jogamp.opengl.util.pngj.chunks;

 

 /**

- * Defines gral strategy about what to do with ancillary (non-critical) chunks when reading

+ * Defines gral strategy about what to do with ancillary (non-critical) chunks

+ * when reading

  */

 public enum ChunkLoadBehaviour {

 	/**

@@ -9,7 +10,8 @@ public enum ChunkLoadBehaviour {
 	 */

 	LOAD_CHUNK_NEVER,

 	/**

-	 * Ancillary chunks are loaded only if 'known' (registered with the factory).

+	 * Ancillary chunks are loaded only if 'known' (registered with the

+	 * factory).

 	 */

 	LOAD_CHUNK_KNOWN,

 	/**

@@ -19,7 +21,8 @@ public enum ChunkLoadBehaviour {
 	LOAD_CHUNK_IF_SAFE,

 	/**

 	 * Load all chunks. <br>

-	 * Notice that other restrictions might apply, see PngReader.skipChunkMaxSize PngReader.skipChunkIds

+	 * Notice that other restrictions might apply, see

+	 * PngReader.skipChunkMaxSize PngReader.skipChunkIds

 	 */

 	LOAD_CHUNK_ALWAYS;

 }

diff --git a/src/jogl/classes/jogamp/opengl/util/pngj/chunks/ChunkRaw.java b/src/jogl/classes/jogamp/opengl/util/pngj/chunks/ChunkRaw.java
index 8dd0ef476..3aba26cca 100644
--- a/src/jogl/classes/jogamp/opengl/util/pngj/chunks/ChunkRaw.java
+++ b/src/jogl/classes/jogamp/opengl/util/pngj/chunks/ChunkRaw.java
@@ -13,13 +13,15 @@ import jogamp.opengl.util.pngj.PngjOutputException;
 /**

  * Raw (physical) chunk.

  * <p>

- * Short lived object, to be created while serialing/deserializing Do not reuse it for different chunks. <br>

+ * Short lived object, to be created while serialing/deserializing Do not reuse

+ * it for different chunks. <br>

  * See http://www.libpng.org/pub/png/spec/1.2/PNG-Structure.html

  */

 public class ChunkRaw {

 	/**

-	 * The length counts only the data field, not itself, the chunk type code, or the CRC. Zero is a valid length.

-	 * Although encoders and decoders should treat the length as unsigned, its value must not exceed 231-1 bytes.

+	 * The length counts only the data field, not itself, the chunk type code,

+	 * or the CRC. Zero is a valid length. Although encoders and decoders should

+	 * treat the length as unsigned, its value must not exceed 231-1 bytes.

 	 */

 	public final int len;

 

@@ -29,12 +31,14 @@ public class ChunkRaw {
 	public final byte[] idbytes = new byte[4];

 

 	/**

-	 * The data bytes appropriate to the chunk type, if any. This field can be of zero length. Does not include crc

+	 * The data bytes appropriate to the chunk type, if any. This field can be

+	 * of zero length. Does not include crc

 	 */

 	public byte[] data = null;

 	/**

-	 * A 4-byte CRC (Cyclic Redundancy Check) calculated on the preceding bytes in the chunk, including the chunk type

-	 * code and chunk data fields, but not including the length field.

+	 * A 4-byte CRC (Cyclic Redundancy Check) calculated on the preceding bytes

+	 * in the chunk, including the chunk type code and chunk data fields, but

+	 * not including the length field.

 	 */

 	private int crcval = 0;

 

@@ -71,7 +75,8 @@ public class ChunkRaw {
 	}

 

 	/**

-	 * Computes the CRC and writes to the stream. If error, a PngjOutputException is thrown

+	 * Computes the CRC and writes to the stream. If error, a

+	 * PngjOutputException is thrown

 	 */

 	public void writeChunk(OutputStream os) {

 		if (idbytes.length != 4)

@@ -85,8 +90,8 @@ public class ChunkRaw {
 	}

 

 	/**

-	 * position before: just after chunk id. positon after: after crc Data should be already allocated. Checks CRC

-	 * Return number of byte read.

+	 * position before: just after chunk id. positon after: after crc Data

+	 * should be already allocated. Checks CRC Return number of byte read.

 	 */

 	public int readChunkData(InputStream is, boolean checkCrc) {

 		PngHelperInternal.readBytes(is, data, 0, len);

diff --git a/src/jogl/classes/jogamp/opengl/util/pngj/chunks/ChunksList.java b/src/jogl/classes/jogamp/opengl/util/pngj/chunks/ChunksList.java
index ad788f154..5ce94ff9f 100644
--- a/src/jogl/classes/jogamp/opengl/util/pngj/chunks/ChunksList.java
+++ b/src/jogl/classes/jogamp/opengl/util/pngj/chunks/ChunksList.java
@@ -49,8 +49,8 @@ public class ChunksList {
 	}

 

 	/**

-	 * Returns a copy of the list (but the chunks are not copied) <b> This should not be used for general metadata

-	 * handling

+	 * Returns a copy of the list (but the chunks are not copied) <b> This

+	 * should not be used for general metadata handling

 	 */

 	public ArrayList<PngChunk> getChunks() {

 		return new ArrayList<PngChunk>(chunks);

@@ -96,7 +96,8 @@ public class ChunksList {
 	}

 

 	/**

-	 * If innerid!=null and the chunk is PngChunkTextVar or PngChunkSPLT, it's filtered by that id

+	 * If innerid!=null and the chunk is PngChunkTextVar or PngChunkSPLT, it's

+	 * filtered by that id

 	 * 

 	 * @param id

 	 * @return innerid Only used for text and SPLT chunks

@@ -119,8 +120,9 @@ public class ChunksList {
 	/**

 	 * Returns only one chunk or null if nothing found - does not include queued

 	 * <p>

-	 * If more than one chunk is found, then an exception is thrown (failifMultiple=true or chunk is single) or the last

-	 * one is returned (failifMultiple=false)

+	 * If more than one chunk is found, then an exception is thrown

+	 * (failifMultiple=true or chunk is single) or the last one is returned

+	 * (failifMultiple=false)

 	 **/

 	public PngChunk getById1(final String id, final boolean failIfMultiple) {

 		return getById1(id, null, failIfMultiple);

@@ -129,8 +131,9 @@ public class ChunksList {
 	/**

 	 * Returns only one chunk or null if nothing found - does not include queued

 	 * <p>

-	 * If more than one chunk (after filtering by inner id) is found, then an exception is thrown (failifMultiple=true

-	 * or chunk is single) or the last one is returned (failifMultiple=false)

+	 * If more than one chunk (after filtering by inner id) is found, then an

+	 * exception is thrown (failifMultiple=true or chunk is single) or the last

+	 * one is returned (failifMultiple=false)

 	 **/

 	public PngChunk getById1(final String id, final String innerid, final boolean failIfMultiple) {

 		List<? extends PngChunk> list = getById(id, innerid);

diff --git a/src/jogl/classes/jogamp/opengl/util/pngj/chunks/ChunksListForWrite.java b/src/jogl/classes/jogamp/opengl/util/pngj/chunks/ChunksListForWrite.java
index 204c4c2a5..e76456ad4 100644
--- a/src/jogl/classes/jogamp/opengl/util/pngj/chunks/ChunksListForWrite.java
+++ b/src/jogl/classes/jogamp/opengl/util/pngj/chunks/ChunksListForWrite.java
@@ -13,7 +13,8 @@ import jogamp.opengl.util.pngj.PngjOutputException;
 public class ChunksListForWrite extends ChunksList {
 
 	/**
-	 * chunks not yet writen - does not include IHDR, IDAT, END, perhaps yes PLTE
+	 * chunks not yet writen - does not include IHDR, IDAT, END, perhaps yes
+	 * PLTE
 	 */
 	private final List<PngChunk> queuedChunks = new ArrayList<PngChunk>();
 
@@ -67,8 +68,9 @@ public class ChunksListForWrite extends ChunksList {
 	/**
 	 * Remove Chunk: only from queued
 	 * 
-	 * WARNING: this depends on c.equals() implementation, which is straightforward for SingleChunks. For
-	 * MultipleChunks, it will normally check for reference equality!
+	 * WARNING: this depends on c.equals() implementation, which is
+	 * straightforward for SingleChunks. For MultipleChunks, it will normally
+	 * check for reference equality!
 	 */
 	public boolean removeChunk(PngChunk c) {
 		return queuedChunks.remove(c);
@@ -87,7 +89,8 @@ public class ChunksListForWrite extends ChunksList {
 	}
 
 	/**
-	 * this should be called only for ancillary chunks and PLTE (groups 1 - 3 - 5)
+	 * this should be called only for ancillary chunks and PLTE (groups 1 - 3 -
+	 * 5)
 	 **/
 	private static boolean shouldWrite(PngChunk c, int currentGroup) {
 		if (currentGroup == CHUNK_GROUP_2_PLTE)
diff --git a/src/jogl/classes/jogamp/opengl/util/pngj/chunks/PngChunk.java b/src/jogl/classes/jogamp/opengl/util/pngj/chunks/PngChunk.java
index 1d630591e..a45979ec2 100644
--- a/src/jogl/classes/jogamp/opengl/util/pngj/chunks/PngChunk.java
+++ b/src/jogl/classes/jogamp/opengl/util/pngj/chunks/PngChunk.java
@@ -12,13 +12,16 @@ import jogamp.opengl.util.pngj.PngjExceptionInternal;
  * Represents a instance of a PNG chunk.

  * <p>

  * See <a

- * href="http://www.libpng.org/pub/png/spec/1.2/PNG-Chunks.html">http://www.libpng.org/pub/png/spec/1.2/PNG-Chunks

- * .html</a> </a>

+ * href="http://www.libpng.org/pub/png/spec/1.2/PNG-Chunks.html">http://www

+ * .libpng.org/pub/png/spec/1.2/PNG-Chunks .html</a> </a>

  * <p>

- * Concrete classes should extend {@link PngChunkSingle} or {@link PngChunkMultiple}

+ * Concrete classes should extend {@link PngChunkSingle} or

+ * {@link PngChunkMultiple}

  * <p>

- * Note that some methods/fields are type-specific (getOrderingConstraint(), allowsMultiple()),<br>

- * some are 'almost' type-specific (id,crit,pub,safe; the exception is PngUKNOWN), <br>

+ * Note that some methods/fields are type-specific (getOrderingConstraint(),

+ * allowsMultiple()),<br>

+ * some are 'almost' type-specific (id,crit,pub,safe; the exception is

+ * PngUKNOWN), <br>

  * and the rest are instance-specific

  */

 public abstract class PngChunk {

@@ -35,8 +38,9 @@ public abstract class PngChunk {
 	protected final ImageInfo imgInfo;

 

 	/**

-	 * Possible ordering constraint for a PngChunk type -only relevant for ancillary chunks. Theoretically, there could

-	 * be more general constraints, but these cover the constraints for standard chunks.

+	 * Possible ordering constraint for a PngChunk type -only relevant for

+	 * ancillary chunks. Theoretically, there could be more general constraints,

+	 * but these cover the constraints for standard chunks.

 	 */

 	public enum ChunkOrderingConstraint {

 		/**

@@ -83,8 +87,8 @@ public abstract class PngChunk {
 	/**

 	 * This static map defines which PngChunk class correspond to which ChunkID

 	 * <p>

-	 * The client can add other chunks to this map statically, before reading an image, calling

-	 * PngChunk.factoryRegister(id,class)

+	 * The client can add other chunks to this map statically, before reading an

+	 * image, calling PngChunk.factoryRegister(id,class)

 	 */

 	private final static Map<String, Class<? extends PngChunk>> factoryMap = new HashMap<String, Class<? extends PngChunk>>();

 	static {

@@ -114,8 +118,9 @@ public abstract class PngChunk {
 	/**

 	 * Registers a chunk-id (4 letters) to be associated with a PngChunk class

 	 * <p>

-	 * This method should be called by user code that wants to add some chunks (not implmemented in this library) to the

-	 * factory, so that the PngReader knows about it.

+	 * This method should be called by user code that wants to add some chunks

+	 * (not implmemented in this library) to the factory, so that the PngReader

+	 * knows about it.

 	 */

 	public static void factoryRegister(String chunkId, Class<? extends PngChunk> chunkClass) {

 		factoryMap.put(chunkId, chunkClass);

@@ -124,9 +129,11 @@ public abstract class PngChunk {
 	/**

 	 * True if the chunk-id type is known.

 	 * <p>

-	 * A chunk is known if we recognize its class, according with <code>factoryMap</code>

+	 * A chunk is known if we recognize its class, according with

+	 * <code>factoryMap</code>

 	 * <p>

-	 * This is not necessarily the same as being "STANDARD", or being implemented in this library

+	 * This is not necessarily the same as being "STANDARD", or being

+	 * implemented in this library

 	 * <p>

 	 * Unknown chunks will be parsed as instances of {@link PngChunkUNKNOWN}

 	 */

@@ -143,7 +150,8 @@ public abstract class PngChunk {
 	}

 

 	/**

-	 * This factory creates the corresponding chunk and parses the raw chunk. This is used when reading.

+	 * This factory creates the corresponding chunk and parses the raw chunk.

+	 * This is used when reading.

 	 */

 	public static PngChunk factory(ChunkRaw chunk, ImageInfo info) {

 		PngChunk c = factoryFromId(ChunkHelper.toString(chunk.idbytes), info);

@@ -153,7 +161,8 @@ public abstract class PngChunk {
 	}

 

 	/**

-	 * Creates one new blank chunk of the corresponding type, according to factoryMap (PngChunkUNKNOWN if not known)

+	 * Creates one new blank chunk of the corresponding type, according to

+	 * factoryMap (PngChunkUNKNOWN if not known)

 	 */

 	public static PngChunk factoryFromId(String cid, ImageInfo info) {

 		PngChunk chunk = null;

@@ -189,7 +198,8 @@ public abstract class PngChunk {
 	}

 

 	/**

-	 * In which "chunkGroup" (see {@link ChunksList}for definition) this chunks instance was read or written.

+	 * In which "chunkGroup" (see {@link ChunksList}for definition) this chunks

+	 * instance was read or written.

 	 * <p>

 	 * -1 if not read or written (eg, queued)

 	 */

@@ -236,16 +246,16 @@ public abstract class PngChunk {
 	}

 

 	/**

-	 * Creates the physical chunk. This is used when writing (serialization). Each particular chunk class implements its

-	 * own logic.

+	 * Creates the physical chunk. This is used when writing (serialization).

+	 * Each particular chunk class implements its own logic.

 	 * 

 	 * @return A newly allocated and filled raw chunk

 	 */

 	public abstract ChunkRaw createRawChunk();

 

 	/**

-	 * Parses raw chunk and fill inside data. This is used when reading (deserialization). Each particular chunk class

-	 * implements its own logic.

+	 * Parses raw chunk and fill inside data. This is used when reading

+	 * (deserialization). Each particular chunk class implements its own logic.

 	 */

 	public abstract void parseFromRaw(ChunkRaw c);

 

@@ -254,7 +264,8 @@ public abstract class PngChunk {
 	 * <p>

 	 * This is used when copying chunks from a reader to a writer

 	 * <p>

-	 * It should normally be a deep copy, and after the cloning this.equals(other) should return true

+	 * It should normally be a deep copy, and after the cloning

+	 * this.equals(other) should return true

 	 */

 	public abstract void cloneDataFromRead(PngChunk other);

 

diff --git a/src/jogl/classes/jogamp/opengl/util/pngj/chunks/PngChunkIDAT.java b/src/jogl/classes/jogamp/opengl/util/pngj/chunks/PngChunkIDAT.java
index b816db205..911513c0d 100644
--- a/src/jogl/classes/jogamp/opengl/util/pngj/chunks/PngChunkIDAT.java
+++ b/src/jogl/classes/jogamp/opengl/util/pngj/chunks/PngChunkIDAT.java
@@ -7,7 +7,8 @@ import jogamp.opengl.util.pngj.ImageInfo;
  * <p>

  * see http://www.w3.org/TR/PNG/#11IDAT

  * <p>

- * This is dummy placeholder - we write/read this chunk (actually several) by special code.

+ * This is dummy placeholder - we write/read this chunk (actually several) by

+ * special code.

  */

 public class PngChunkIDAT extends PngChunkMultiple {

 	public final static String ID = ChunkHelper.IDAT;

diff --git a/src/jogl/classes/jogamp/opengl/util/pngj/chunks/PngChunkMultiple.java b/src/jogl/classes/jogamp/opengl/util/pngj/chunks/PngChunkMultiple.java
index 696edd431..d44250a2f 100644
--- a/src/jogl/classes/jogamp/opengl/util/pngj/chunks/PngChunkMultiple.java
+++ b/src/jogl/classes/jogamp/opengl/util/pngj/chunks/PngChunkMultiple.java
@@ -17,7 +17,8 @@ public abstract class PngChunkMultiple extends PngChunk {
 	}

 

 	/**

-	 * NOTE: this chunk uses the default Object's equals() hashCode() implementation.

+	 * NOTE: this chunk uses the default Object's equals() hashCode()

+	 * implementation.

 	 * 

 	 * This is the right thing to do, normally.

 	 * 

diff --git a/src/jogl/classes/jogamp/opengl/util/pngj/chunks/PngChunkSingle.java b/src/jogl/classes/jogamp/opengl/util/pngj/chunks/PngChunkSingle.java
index 286f39db0..5247169e0 100644
--- a/src/jogl/classes/jogamp/opengl/util/pngj/chunks/PngChunkSingle.java
+++ b/src/jogl/classes/jogamp/opengl/util/pngj/chunks/PngChunkSingle.java
@@ -3,7 +3,8 @@ package jogamp.opengl.util.pngj.chunks;
 import jogamp.opengl.util.pngj.ImageInfo;

 

 /**

- * PNG chunk type (abstract) that does not allow multiple instances in same image.

+ * PNG chunk type (abstract) that does not allow multiple instances in same

+ * image.

  */

 public abstract class PngChunkSingle extends PngChunk {

 

diff --git a/src/jogl/classes/jogamp/opengl/util/pngj/chunks/PngMetadata.java b/src/jogl/classes/jogamp/opengl/util/pngj/chunks/PngMetadata.java
index 52d1b22c1..ecf8b98c3 100644
--- a/src/jogl/classes/jogamp/opengl/util/pngj/chunks/PngMetadata.java
+++ b/src/jogl/classes/jogamp/opengl/util/pngj/chunks/PngMetadata.java
@@ -7,13 +7,13 @@ import jogamp.opengl.util.pngj.PngHelperInternal;
 import jogamp.opengl.util.pngj.PngjException;
 
 /**
- * We consider "image metadata" every info inside the image except for the most basic image info (IHDR chunk - ImageInfo
- * class) and the pixels values.
+ * We consider "image metadata" every info inside the image except for the most
+ * basic image info (IHDR chunk - ImageInfo class) and the pixels values.
  * <p>
  * This includes the palette (if present) and all the ancillary chunks
  * <p>
- * This class provides a wrapper over the collection of chunks of a image (read or to write) and provides some high
- * level methods to access them
+ * This class provides a wrapper over the collection of chunks of a image (read
+ * or to write) and provides some high level methods to access them
  */
 public class PngMetadata {
 	private final ChunksList chunkList;
@@ -31,8 +31,9 @@ public class PngMetadata {
 	/**
 	 * Queues the chunk at the writer
 	 * <p>
-	 * lazyOverwrite: if true, checks if there is a queued "equivalent" chunk and if so, overwrites it. However if that
-	 * not check for already written chunks.
+	 * lazyOverwrite: if true, checks if there is a queued "equivalent" chunk
+	 * and if so, overwrites it. However if that not check for already written
+	 * chunks.
 	 */
 	public void queueChunk(final PngChunk c, boolean lazyOverwrite) {
 		ChunksListForWrite cl = getChunkListW();
@@ -87,7 +88,8 @@ public class PngMetadata {
 	 * Creates a time chunk with current time, less secsAgo seconds
 	 * <p>
 	 * 
-	 * @return Returns the created-queued chunk, just in case you want to examine or modify it
+	 * @return Returns the created-queued chunk, just in case you want to
+	 *         examine or modify it
 	 */
 	public PngChunkTIME setTimeNow(int secsAgo) {
 		PngChunkTIME c = new PngChunkTIME(chunkList.imageInfo);
@@ -104,7 +106,8 @@ public class PngMetadata {
 	 * Creates a time chunk with diven date-time
 	 * <p>
 	 * 
-	 * @return Returns the created-queued chunk, just in case you want to examine or modify it
+	 * @return Returns the created-queued chunk, just in case you want to
+	 *         examine or modify it
 	 */
 	public PngChunkTIME setTimeYMDHMS(int yearx, int monx, int dayx, int hourx, int minx, int secx) {
 		PngChunkTIME c = new PngChunkTIME(chunkList.imageInfo);
@@ -137,7 +140,8 @@ public class PngMetadata {
 	 *            (arbitrary, should be latin1 if useLatin1)
 	 * @param useLatin1
 	 * @param compress
-	 * @return Returns the created-queued chunks, just in case you want to examine, touch it
+	 * @return Returns the created-queued chunks, just in case you want to
+	 *         examine, touch it
 	 */
 	public PngChunkTextVar setText(String k, String val, boolean useLatin1, boolean compress) {
 		if (compress && !useLatin1)
@@ -180,7 +184,8 @@ public class PngMetadata {
 	}
 
 	/**
-	 * Returns empty if not found, concatenated (with newlines) if multiple! - and trimmed
+	 * Returns empty if not found, concatenated (with newlines) if multiple! -
+	 * and trimmed
 	 * <p>
 	 * Use getTxtsForKey() if you don't want this behaviour
 	 */
@@ -204,7 +209,8 @@ public class PngMetadata {
 	}
 
 	/**
-	 * Creates a new empty palette chunk, queues it for write and return it to the caller, who should fill its entries
+	 * Creates a new empty palette chunk, queues it for write and return it to
+	 * the caller, who should fill its entries
 	 */
 	public PngChunkPLTE createPLTEChunk() {
 		PngChunkPLTE plte = new PngChunkPLTE(chunkList.imageInfo);
@@ -222,7 +228,8 @@ public class PngMetadata {
 	}
 
 	/**
-	 * Creates a new empty TRNS chunk, queues it for write and return it to the caller, who should fill its entries
+	 * Creates a new empty TRNS chunk, queues it for write and return it to the
+	 * caller, who should fill its entries
 	 */
 	public PngChunkTRNS createTRNSChunk() {
 		PngChunkTRNS trns = new PngChunkTRNS(chunkList.imageInfo);
diff --git a/src/newt/classes/com/jogamp/newt/event/KeyEvent.java b/src/newt/classes/com/jogamp/newt/event/KeyEvent.java
index ec05a34ad..156708779 100644
--- a/src/newt/classes/com/jogamp/newt/event/KeyEvent.java
+++ b/src/newt/classes/com/jogamp/newt/event/KeyEvent.java
@@ -319,14 +319,16 @@ public class KeyEvent extends InputEvent
             if( ( nonPrintableKeys[0].min <= uniChar && uniChar <= nonPrintableKeys[0].max ) ||
                 ( nonPrintableKeys[1].min <= uniChar && uniChar <= nonPrintableKeys[1].max ) ||
                 ( nonPrintableKeys[2].min <= uniChar && uniChar <= nonPrintableKeys[2].max ) || 
-                ( nonPrintableKeys[3].min <= uniChar && uniChar <= nonPrintableKeys[3].max ) ) {
+                ( nonPrintableKeys[3].min <= uniChar && uniChar <= nonPrintableKeys[3].max ) ||
+                ( nonPrintableKeys[4].min <= uniChar && uniChar <= nonPrintableKeys[4].max ) ) {
                 return false;
             }
         } else {
             if( ( nonPrintableKeys[0].inclKeyChar && nonPrintableKeys[0].min <= uniChar && uniChar <= nonPrintableKeys[0].max ) ||
                 ( nonPrintableKeys[1].inclKeyChar && nonPrintableKeys[1].min <= uniChar && uniChar <= nonPrintableKeys[1].max ) ||
                 ( nonPrintableKeys[2].inclKeyChar && nonPrintableKeys[2].min <= uniChar && uniChar <= nonPrintableKeys[2].max ) ||
-                ( nonPrintableKeys[3].inclKeyChar && nonPrintableKeys[3].min <= uniChar && uniChar <= nonPrintableKeys[3].max ) ) {
+                ( nonPrintableKeys[3].inclKeyChar && nonPrintableKeys[3].min <= uniChar && uniChar <= nonPrintableKeys[3].max ) ||
+                ( nonPrintableKeys[4].inclKeyChar && nonPrintableKeys[4].min <= uniChar && uniChar <= nonPrintableKeys[4].max ) ) {
                 return false;
             }
         }
@@ -381,9 +383,10 @@ public class KeyEvent extends InputEvent
             this.inclKeyChar = inclKeyChar;
         }
     };
-    /** Non printable key ranges, currently fixed to an array of size 4. */
+    /** Non printable key ranges, currently fixed to an array of size 5. */
     public final static NonPrintableRange[] nonPrintableKeys = { 
-        new NonPrintableRange( (short)0x0000, (short)0x001F, true ),  // Unicode: Non printable controls: [0x00 - 0x1F]
+        new NonPrintableRange( (short)0x0000, (short)0x0007, true ),  // Unicode: Non printable controls: [0x00 - 0x07]
+        new NonPrintableRange( (short)0x000A, (short)0x001F, true ),  // Unicode: Non printable controls: [0x0A - 0x1F]
         new NonPrintableRange( (short)0x0061, (short)0x0078, false),  // Small 'a' thru 'z' (0x61 - 0x7a) - Not used for keyCode / keySym - Re-used for Fn (collision)
         new NonPrintableRange( (short)0x008F, (short)0x009F, true ),  // Unicode: Non printable controls: [0x7F - 0x9F], Numpad keys [0x7F - 0x8E] are printable! 
         new NonPrintableRange( (short)0xE000, (short)0xF8FF, true )   // Unicode: Private 0xE000 - 0xF8FF (Marked Non-Printable)
@@ -415,14 +418,14 @@ public class KeyEvent extends InputEvent
            static final short VK_FREE06         = (short) 0x06;
            static final short VK_FREE07         = (short) 0x07;
     
-    /** Constant for the BACK SPACE key "\b", matching ASCII. */
+    /** Constant for the BACK SPACE key "\b", matching ASCII. Printable! */
     public static final short VK_BACK_SPACE     = (short) 0x08;
     
-    /** Constant for the HORIZ TAB key "\t", matching ASCII. */
+    /** Constant for the HORIZ TAB key "\t", matching ASCII. Printable! */
     public static final short VK_TAB            = (short) 0x09;
     
-    /** Constant for the ENTER key, i.e. LINE FEED "\n", matching ASCII. */
-    public static final short VK_ENTER          = (short) 0x0A;
+           /** LINE_FEED "\n", matching ASCII, n/a on keyboard. */
+           static final short VK_FREE0A         = (short) 0x0A;
     
     /** Constant for the PAGE DOWN function key. ASCII: Vertical Tabulation. */
     public static final short VK_PAGE_DOWN      = (short) 0x0B;
@@ -430,7 +433,9 @@ public class KeyEvent extends InputEvent
     /** Constant for the CLEAR key, i.e. FORM FEED, matching ASCII. */
     public static final short VK_CLEAR          = (short) 0x0C;
     
-           static final short VK_FREE0D         = (short) 0x0D;
+    /** Constant for the ENTER key, i.e. CARRIAGE RETURN, matching ASCII. Non printable! */
+    public static final short VK_ENTER          = (short) 0x0D;
+    
            static final short VK_FREE0E         = (short) 0x0E;
     
     /** Constant for the CTRL function key. ASCII: shift-in. */
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/TextureDraw01ES2Listener.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/TextureDraw01ES2Listener.java
index 622df8695..55d0a4775 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/TextureDraw01ES2Listener.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/TextureDraw01ES2Listener.java
@@ -56,14 +56,18 @@ public class TextureDraw01ES2Listener implements GLEventListener, TextureDraw01A
     PMVMatrix pmvMatrix;
     GLUniformData pmvMatrixUniform;
     GLArrayDataServer interleavedVBO;
-    
+    float[] clearColor = new float[] { 1.0f, 1.0f, 1.0f, 1.0f };
     
     public TextureDraw01ES2Listener(TextureData td) {
         this.textureData = td;
     }
+    
+    public void setClearColor(float[] clearColor) {
+        this.clearColor = clearColor;
+    }
 
     static final String shaderBasename = "texture01_xxx";
-    
+       
     private void initShader(GL2ES2 gl, boolean use_program) {
         // Create & Compile the shader objects
         ShaderCode rsVp = ShaderCode.create(gl, GL2ES2.GL_VERTEX_SHADER, this.getClass(), 
@@ -134,7 +138,7 @@ public class TextureDraw01ES2Listener implements GLEventListener, TextureDraw01A
         st.ownAttribute(interleavedVBO, true);
         
         // OpenGL Render Settings
-        gl.glClearColor(0, 0, 0, 1);
+        gl.glClearColor(clearColor[0], clearColor[1], clearColor[2], clearColor[3]);
         gl.glEnable(GL2ES2.GL_DEPTH_TEST);
         st.useProgram(gl, false);        
     }
@@ -164,8 +168,7 @@ public class TextureDraw01ES2Listener implements GLEventListener, TextureDraw01A
         gl.glViewport(0, 0, width, height);
 
         // Clear background to white
-        gl.glClearColor(1.0f, 1.0f, 1.0f, 0.4f);
-
+        gl.glClearColor(clearColor[0], clearColor[1], clearColor[2], clearColor[3]);
         if(null != st) {
             pmvMatrix.glMatrixMode(GLMatrixFunc.GL_PROJECTION);
             pmvMatrix.glLoadIdentity();
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/texture01_xxx.fp b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/texture01_xxx.fp
index c213f3ab4..93f252cd6 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/texture01_xxx.fp
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/texture01_xxx.fp
@@ -19,10 +19,10 @@ void main (void)
   if(0.0 <= mgl_texCoord.t && mgl_texCoord.t<=1.0) {
     texColor = texture2D(mgl_ActiveTexture, mgl_texCoord);
   } else {
-    texColor = vec4(1, 1, 1, 1);
+    discard;
   }
 
-  // mix frontColor with texture ..
-  mgl_FragColor = vec4(frontColor*texColor);
+  // mix frontColor with texture ..  pre-multiplying texture alpha
+  mgl_FragColor = vec4( mix( frontColor.rgb, texColor.rgb, texColor.a ), frontColor.a );
 }
 
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestJPEGImage01NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestJPEGImage01NEWT.java
index bf8323e88..5181dc2d3 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestJPEGImage01NEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestJPEGImage01NEWT.java
@@ -1,3 +1,30 @@
+/**
+ * Copyright 2012 JogAmp Community. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ * 
+ *    1. Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ * 
+ *    2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * The views and conclusions contained in the software and documentation are those of the
+ * authors and should not be interpreted as representing official policies, either expressed
+ * or implied, of JogAmp Community.
+ */
 package com.jogamp.opengl.test.junit.jogl.util.texture;
 
 import java.io.IOException;
@@ -28,24 +55,36 @@ import com.jogamp.opengl.util.texture.TextureIO;
 import com.jogamp.opengl.util.texture.spi.JPEGImage;
 import javax.media.opengl.GL;
 
+/**
+ * Test reading and displaying a JPG image.
+ * <p>
+ * Main function accepts arbitrary JPG file name for manual tests.
+ * </p>
+ */
 public class TestJPEGImage01NEWT extends UITestCase {
     
     static boolean showFPS = false;
     static long duration = 100; // ms
     
-    public void testImpl(final boolean withAlpha, final InputStream istream) throws InterruptedException, IOException {
+    public void testImpl(final InputStream istream) throws InterruptedException, IOException {
+        final JPEGImage image = JPEGImage.read(istream);
+        Assert.assertNotNull(image);
+        final boolean hasAlpha = 4 == image.getBytesPerPixel();
+        System.err.println("JPEGImage: "+image+", hasAlpha "+hasAlpha);
+        
         final GLReadBufferUtil screenshot = new GLReadBufferUtil(true, false);
         final GLProfile glp = GLProfile.getGL2ES2();
         final GLCapabilities caps = new GLCapabilities(glp);
-        if( withAlpha ) {
+        if( hasAlpha ) {
             caps.setAlphaBits(1);
         }
-        
-        final JPEGImage image = JPEGImage.read(istream);
-        Assert.assertNotNull(image);
-        System.err.println("JPEGImage: "+image);
-        
-        final int internalFormat = (image.getBytesPerPixel()==4)?GL.GL_RGBA:GL.GL_RGB;
+                
+        final int internalFormat;
+        if(glp.isGL2GL3()) {
+            internalFormat = hasAlpha ? GL.GL_RGBA8 : GL.GL_RGB8;
+        } else {
+            internalFormat = hasAlpha ? GL.GL_RGBA : GL.GL_RGB;
+        }        
         final TextureData texData = new TextureData(glp, internalFormat,
                                        image.getWidth(),
                                        image.getHeight(),
@@ -102,10 +141,10 @@ public class TestJPEGImage01NEWT extends UITestCase {
     }
     
     @Test
-    public void testReadES2_RGB() throws InterruptedException, IOException, MalformedURLException {
+    public void testReadES2_RGBn() throws InterruptedException, IOException, MalformedURLException {
         final String fname = null == _fname ? "test-ntscN_3-01-160x90-90pct-yuv444-base.jpg" : _fname;
         final URLConnection urlConn = IOUtil.getResource(this.getClass(), fname);
-        testImpl(false, urlConn.getInputStream());
+        testImpl(urlConn.getInputStream());
     }
 
     static String _fname = null;
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestPNGImage00NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestPNGImage00NEWT.java
new file mode 100644
index 000000000..aedb6a573
--- /dev/null
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestPNGImage00NEWT.java
@@ -0,0 +1,89 @@
+/**
+ * Copyright 2010 JogAmp Community. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ * 
+ *    1. Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ * 
+ *    2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * The views and conclusions contained in the software and documentation are those of the
+ * authors and should not be interpreted as representing official policies, either expressed
+ * or implied, of JogAmp Community.
+ */
+package com.jogamp.opengl.test.junit.jogl.util.texture;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URLConnection;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.jogamp.common.util.IOUtil;
+import com.jogamp.opengl.test.junit.util.UITestCase;
+import com.jogamp.opengl.util.texture.spi.PNGImage;
+
+public class TestPNGImage00NEWT extends UITestCase {
+    @Test
+    public void testPNGReadWriteAndCompare() throws InterruptedException, IOException, MalformedURLException {
+        final File out1_f=new File(getSimpleTestName(".")+"-PNGImageTest1.png");
+        final File out2_f=new File(getSimpleTestName(".")+"-PNGImageTest2.png");
+        final File out2F_f=new File(getSimpleTestName(".")+"-PNGImageTest2Flipped.png");
+        final File out2R_f=new File(getSimpleTestName(".")+"-PNGImageTest2Reversed.png");
+        final File out2RF_f=new File(getSimpleTestName(".")+"-PNGImageTest2ReversedFlipped.png");
+        final String url_s="jogl/util/data/av/test-ntsc01-160x90.png";
+        URLConnection urlConn = IOUtil.getResource(url_s, this.getClass().getClassLoader());
+        PNGImage image1 = PNGImage.read(urlConn.getInputStream());
+        System.err.println("PNGImage - Orig: "+image1);        
+        image1.write(out1_f, true); 
+        {
+            Assert.assertEquals(image1.getData(), PNGImage.read(out1_f.toURI().toURL().openStream()).getData());
+        }
+        
+        final PNGImage image2 = PNGImage.createFromData(image1.getWidth(), image1.getHeight(), 
+                                                        image1.getDpi()[0], image1.getDpi()[1], 
+                                                        image1.getBytesPerPixel(), false /* reverseChannels */, image1.isGLOriented(), image1.getData());
+        image2.write(out2_f, true);
+        {
+            Assert.assertEquals(image1.getData(), PNGImage.read(out2_f.toURI().toURL().openStream()).getData());
+        }
+        
+        // flipped
+        final PNGImage image2F = PNGImage.createFromData(image1.getWidth(), image1.getHeight(), 
+                                                         image1.getDpi()[0], image1.getDpi()[1], 
+                                                         image1.getBytesPerPixel(), false /* reverseChannels */, !image1.isGLOriented(), image1.getData());
+        image2F.write(out2F_f, true);
+        
+        // reversed channels
+        final PNGImage image2R = PNGImage.createFromData(image1.getWidth(), image1.getHeight(), 
+                                                         image1.getDpi()[0], image1.getDpi()[1], 
+                                                         image1.getBytesPerPixel(), true /* reverseChannels */, image1.isGLOriented(), image1.getData());
+        image2R.write(out2R_f, true);
+        
+        // reversed channels and flipped
+        final PNGImage image2RF = PNGImage.createFromData(image1.getWidth(), image1.getHeight(), 
+                                                         image1.getDpi()[0], image1.getDpi()[1], 
+                                                         image1.getBytesPerPixel(), true /* reverseChannels */, !image1.isGLOriented(), image1.getData());
+        image2RF.write(out2RF_f, true);
+    }
+    
+    public static void main(String args[]) {
+        org.junit.runner.JUnitCore.main(TestPNGImage00NEWT.class.getName());
+    }
+}
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestPNGImage01NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestPNGImage01NEWT.java
index 81f64f0ae..839a198b9 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestPNGImage01NEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestPNGImage01NEWT.java
@@ -1,62 +1,179 @@
+/**
+ * Copyright 2010 JogAmp Community. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ * 
+ *    1. Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ * 
+ *    2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * The views and conclusions contained in the software and documentation are those of the
+ * authors and should not be interpreted as representing official policies, either expressed
+ * or implied, of JogAmp Community.
+ */
 package com.jogamp.opengl.test.junit.jogl.util.texture;
 
-import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URLConnection;
 
+import javax.media.opengl.GL;
+import javax.media.opengl.GLAutoDrawable;
+import javax.media.opengl.GLCapabilities;
+import javax.media.opengl.GLEventListener;
+import javax.media.opengl.GLProfile;
+
 import org.junit.Assert;
 import org.junit.Test;
 
 import com.jogamp.common.util.IOUtil;
+import com.jogamp.newt.opengl.GLWindow;
+import com.jogamp.opengl.test.junit.jogl.demos.TextureDraw01Accessor;
+import com.jogamp.opengl.test.junit.jogl.demos.es2.TextureDraw01ES2Listener;
+import com.jogamp.opengl.test.junit.util.MiscUtils;
+import com.jogamp.opengl.test.junit.util.QuitAdapter;
 import com.jogamp.opengl.test.junit.util.UITestCase;
+import com.jogamp.opengl.util.Animator;
+import com.jogamp.opengl.util.GLReadBufferUtil;
+import com.jogamp.opengl.util.GLPixelBuffer.GLPixelAttributes;
+import com.jogamp.opengl.util.texture.TextureData;
+import com.jogamp.opengl.util.texture.TextureIO;
 import com.jogamp.opengl.util.texture.spi.PNGImage;
 
+/**
+ * Test reading and displaying a PNG image.
+ * <p>
+ * Main function accepts arbitrary PNG file name for manual tests.
+ * </p>
+ */
 public class TestPNGImage01NEWT extends UITestCase {
-    @Test
-    public void testPNGReadWriteAndCompare() throws InterruptedException, IOException, MalformedURLException {
-        final File out1_f=new File(getSimpleTestName(".")+"-PNGImageTest1.png");
-        final File out2_f=new File(getSimpleTestName(".")+"-PNGImageTest2.png");
-        final File out2F_f=new File(getSimpleTestName(".")+"-PNGImageTest2Flipped.png");
-        final File out2R_f=new File(getSimpleTestName(".")+"-PNGImageTest2Reversed.png");
-        final File out2RF_f=new File(getSimpleTestName(".")+"-PNGImageTest2ReversedFlipped.png");
-        final String url_s="jogl/util/data/av/test-ntsc01-160x90.png";
-        URLConnection urlConn = IOUtil.getResource(url_s, this.getClass().getClassLoader());
-        PNGImage image1 = PNGImage.read(urlConn.getInputStream());
-        System.err.println("PNGImage - Orig: "+image1);        
-        image1.write(out1_f, true); 
-        {
-            Assert.assertEquals(image1.getData(), PNGImage.read(out1_f.toURI().toURL().openStream()).getData());
-        }
+    
+    static boolean showFPS = false;
+    static long duration = 200; // ms
+    
+    public void testImpl(final InputStream istream) throws InterruptedException, IOException {        
+        final PNGImage image = PNGImage.read(istream);
+        Assert.assertNotNull(image);
+        final boolean hasAlpha = 4 == image.getBytesPerPixel();        
+        System.err.println("PNGImage: "+image);
         
-        final PNGImage image2 = PNGImage.createFromData(image1.getWidth(), image1.getHeight(), 
-                                                        image1.getDpi()[0], image1.getDpi()[1], 
-                                                        image1.getBytesPerPixel(), false /* reverseChannels */, image1.isGLOriented(), image1.getData());
-        image2.write(out2_f, true);
-        {
-            Assert.assertEquals(image1.getData(), PNGImage.read(out2_f.toURI().toURL().openStream()).getData());
+        final GLReadBufferUtil screenshot = new GLReadBufferUtil(true, false);
+        final GLProfile glp = GLProfile.getGL2ES2();
+        final GLCapabilities caps = new GLCapabilities(glp);
+        if( hasAlpha  ) {
+            caps.setAlphaBits(1);
         }
         
-        // flipped
-        final PNGImage image2F = PNGImage.createFromData(image1.getWidth(), image1.getHeight(), 
-                                                         image1.getDpi()[0], image1.getDpi()[1], 
-                                                         image1.getBytesPerPixel(), false /* reverseChannels */, !image1.isGLOriented(), image1.getData());
-        image2F.write(out2F_f, true);
+        final int internalFormat;
+        if(glp.isGL2GL3()) {
+            internalFormat = hasAlpha ? GL.GL_RGBA8 : GL.GL_RGB8;
+        } else {
+            internalFormat = hasAlpha ? GL.GL_RGBA : GL.GL_RGB;
+        }        
+        final TextureData texData = new TextureData(glp, internalFormat,
+                                       image.getWidth(),
+                                       image.getHeight(),
+                                       0,
+                                       new GLPixelAttributes(image.getGLFormat(), image.getGLType()),
+                                       false /* mipmap */,
+                                       false /* compressed */,
+                                       false /* must flip-vert */,
+                                       image.getData(),
+                                       null);
         
-        // reversed channels
-        final PNGImage image2R = PNGImage.createFromData(image1.getWidth(), image1.getHeight(), 
-                                                         image1.getDpi()[0], image1.getDpi()[1], 
-                                                         image1.getBytesPerPixel(), true /* reverseChannels */, image1.isGLOriented(), image1.getData());
-        image2R.write(out2R_f, true);
+        // final TextureData texData = TextureIO.newTextureData(glp, istream, false /* mipmap */, TextureIO.PNG);
+        System.err.println("TextureData: "+texData);        
         
-        // reversed channels and flipped
-        final PNGImage image2RF = PNGImage.createFromData(image1.getWidth(), image1.getHeight(), 
-                                                         image1.getDpi()[0], image1.getDpi()[1], 
-                                                         image1.getBytesPerPixel(), true /* reverseChannels */, !image1.isGLOriented(), image1.getData());
-        image2RF.write(out2RF_f, true);
+        final GLWindow glad = GLWindow.create(caps);
+        glad.setTitle("TestPNGImage01NEWT");
+        // Size OpenGL to Video Surface
+        glad.setSize(texData.getWidth(), texData.getHeight());
+        
+        // load texture from file inside current GL context to match the way
+        // the bug submitter was doing it
+        final TextureDraw01ES2Listener gle = new TextureDraw01ES2Listener( texData ) ;
+        // gle.setClearColor(new float[] { 1.0f, 0.0f, 0.0f, 1.0f } );
+
+        glad.addGLEventListener(gle);
+        glad.addGLEventListener(new GLEventListener() {                    
+            boolean shot = false;
+            
+            @Override public void init(GLAutoDrawable drawable) {
+                System.err.println("Chosen Caps: " + drawable.getChosenGLCapabilities());
+                System.err.println("GL ctx: " + drawable.getGL().getContext());
+            }
+            
+            @Override public void display(GLAutoDrawable drawable) {
+                // 1 snapshot
+                if(null!=((TextureDraw01Accessor)gle).getTexture() && !shot) {
+                    shot = true;
+                    snapshot(0, null, drawable.getGL(), screenshot, TextureIO.PNG, null);
+                }
+            }
+            
+            @Override public void dispose(GLAutoDrawable drawable) { }
+            @Override public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height) { }
+        });
+
+        Animator animator = new Animator(glad);
+        animator.setUpdateFPSFrames(60, showFPS ? System.err : null);
+        QuitAdapter quitAdapter = new QuitAdapter();
+        glad.addKeyListener(quitAdapter);
+        glad.addWindowListener(quitAdapter);
+        glad.setVisible(true);
+        animator.start();
+
+        while(!quitAdapter.shouldQuit() && animator.isAnimating() && animator.getTotalFPSDuration()<duration) {
+            Thread.sleep(100);
+        }
+        
+        animator.stop();
+        glad.destroy();
     }
     
+    @Test
+    public void testRead01_RGBn_exp() throws InterruptedException, IOException, MalformedURLException {
+        final String fname = null == _fname ? "bug724-transparent-grey_gimpexp.png" : _fname;
+        final URLConnection urlConn = IOUtil.getResource(this.getClass(), fname);
+        testImpl(urlConn.getInputStream());
+    }
+
+    @Test
+    public void testRead02_RGBn_orig() throws InterruptedException, IOException, MalformedURLException {
+        if( null != _fname ) {
+            return;
+        }
+        final String fname = "bug724-transparent-grey_orig.png";
+        final URLConnection urlConn = IOUtil.getResource(this.getClass(), fname);
+        testImpl(urlConn.getInputStream());
+    }
+    
+    static String _fname = null;
     public static void main(String args[]) {
+        for(int i=0; i<args.length; i++) {
+            if(args[i].equals("-time")) {
+                i++;
+                duration = MiscUtils.atol(args[i], duration);
+            } else if(args[i].equals("-file")) {
+                i++;
+                _fname = args[i];
+            }
+        }
         org.junit.runner.JUnitCore.main(TestPNGImage01NEWT.class.getName());
     }
 }
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/bug724-transparent-grey_gimpexp.png b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/bug724-transparent-grey_gimpexp.png
new file mode 100644
index 000000000..53b2ec07b
--- /dev/null
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/bug724-transparent-grey_gimpexp.png
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/bug724-transparent-grey_orig.png b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/bug724-transparent-grey_orig.png
new file mode 100644
index 000000000..b85bf7e15
--- /dev/null
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/bug724-transparent-grey_orig.png