Merge remote-tracking branch 'hharrison/master'

23 files changed, 118 insertions, 103 deletions

diff --git a/src/jogl/classes/jogamp/opengl/util/pngj/FilterType.java b/src/jogl/classes/jogamp/opengl/util/pngj/FilterType.java
index 0fffc85b1..5e177b8c3 100644
--- a/src/jogl/classes/jogamp/opengl/util/pngj/FilterType.java
+++ b/src/jogl/classes/jogamp/opengl/util/pngj/FilterType.java
@@ -4,7 +4,7 @@ import java.util.HashMap;
 

 /**

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

- * 

+ *

  */

 public enum FilterType {

 	/**

diff --git a/src/jogl/classes/jogamp/opengl/util/pngj/ImageInfo.java b/src/jogl/classes/jogamp/opengl/util/pngj/ImageInfo.java
index e62134cd5..ac7b858e1 100644
--- a/src/jogl/classes/jogamp/opengl/util/pngj/ImageInfo.java
+++ b/src/jogl/classes/jogamp/opengl/util/pngj/ImageInfo.java
@@ -98,7 +98,7 @@ public class ImageInfo {
 

 	/**

 	 * Full constructor

-	 * 

+	 *

 	 * @param cols

 	 *            Width in pixels

 	 * @param rows

diff --git a/src/jogl/classes/jogamp/opengl/util/pngj/ImageLine.java b/src/jogl/classes/jogamp/opengl/util/pngj/ImageLine.java
index e34e6a226..e6afd8694 100644
--- a/src/jogl/classes/jogamp/opengl/util/pngj/ImageLine.java
+++ b/src/jogl/classes/jogamp/opengl/util/pngj/ImageLine.java
@@ -25,7 +25,7 @@ public class ImageLine {
 	 * 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> 

+	 * <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

@@ -60,7 +60,7 @@ public class ImageLine {
 	/**

 	 * 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

 	 */

@@ -74,7 +74,7 @@ public class ImageLine {
 	}

 

 	/**

-	 * 

+	 *

 	 * @param imgInfo

 	 *            Inmutable ImageInfo, basic parameter of the image we are

 	 *            reading or writing

@@ -84,7 +84,7 @@ public class ImageLine {
 	 * @param unpackedMode

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

 	 *            images

-	 * 

+	 *

 	 */

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

 		this(imgInfo, stype, unpackedMode, null, null);

@@ -124,13 +124,13 @@ public class ImageLine {
 

 	/*

 	 * Unpacks scanline (for bitdepth 1-2-4)

-	 * 

+	 *

 	 * Arrays must be prealocated. src : samplesPerRowPacked dst : samplesPerRow

-	 * 

+	 *

 	 * This usually works in place (with src==dst and length=samplesPerRow)!

-	 * 

+	 *

 	 * If not, you should only call this only when necesary (bitdepth <8)

-	 * 

+	 *

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

 	 */

 	static void unpackInplaceInt(final ImageInfo iminfo, final int[] src, final int[] dst, final boolean scale) {

@@ -165,15 +165,15 @@ public class ImageLine {
 

 	/*

 	 * Unpacks scanline (for bitdepth 1-2-4)

-	 * 

+	 *

 	 * Arrays must be prealocated. src : samplesPerRow dst : samplesPerRowPacked

-	 * 

+	 *

 	 * This usually works in place (with src==dst and length=samplesPerRow)! If not, you should only call this only when

 	 * necesary (bitdepth <8)

-	 * 

+	 *

 	 * The trailing elements are trash

-	 * 

-	 * 

+	 *

+	 *

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

 	 */

 	static void packInplaceInt(final ImageInfo iminfo, final int[] src, final int[] dst, final boolean scaled) {

@@ -270,7 +270,7 @@ public class ImageLine {
 

 	/**

 	 * Creates a new ImageLine similar to this, but unpacked

-	 * 

+	 *

 	 * The caller must be sure that the original was really packed

 	 */

 	public ImageLine unpackToNewImageLine() {

@@ -284,7 +284,7 @@ public class ImageLine {
 

 	/**

 	 * Creates a new ImageLine similar to this, but packed

-	 * 

+	 *

 	 * The caller must be sure that the original was really unpacked

 	 */

 	public ImageLine packToNewImageLine() {

@@ -315,6 +315,7 @@ public class ImageLine {
 	/**

 	 * Basic info

 	 */

+	@Override

 	public String toString() {

 		return "row=" + rown + " cols=" + imgInfo.cols + " bpc=" + imgInfo.bitDepth + " size=" + scanline.length;

 	}

diff --git a/src/jogl/classes/jogamp/opengl/util/pngj/ImageLineHelper.java b/src/jogl/classes/jogamp/opengl/util/pngj/ImageLineHelper.java
index 91516a704..4636c3955 100644
--- a/src/jogl/classes/jogamp/opengl/util/pngj/ImageLineHelper.java
+++ b/src/jogl/classes/jogamp/opengl/util/pngj/ImageLineHelper.java
@@ -23,7 +23,7 @@ public class ImageLineHelper {
 	/**

 	 * 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

 	 * @param pal

@@ -92,6 +92,7 @@ public class ImageLineHelper {
 		public double[] maxdif = { BIG_VALUE_NEG, BIG_VALUE_NEG, BIG_VALUE_NEG, BIG_VALUE }; // maxima

 		public final int channels; // diferencia

 

+		@Override

 		public String toString() {

 			return channels == 3 ? String.format(

 					"prom=%.1f (%.1f %.1f %.1f) max=%.1f (%.1f %.1f %.1f) min=%.1f (%.1f %.1f %.1f)", promlum, prom[0],

@@ -143,7 +144,7 @@ public class ImageLineHelper {
 

 	/**

 	 * integer packed R G B only for bitdepth=8! (does not check!)

-	 * 

+	 *

 	 **/

 	public static int getPixelRGB8(ImageLine line, int column) {

 		int offset = column * line.channels;

@@ -252,7 +253,7 @@ public class ImageLineHelper {
 	 * <code>scale==true<code>, it scales the value (just a bit shift) towards 0-255.

 	 * <p>

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

-	 * 

+	 *

 	 */

 	public static int[] unpack(ImageInfo imgInfo, int[] src, int[] dst, boolean scale) {

 		int len1 = imgInfo.samplesPerRow;

@@ -282,7 +283,7 @@ public class ImageLineHelper {
 	 * Packs scanline (for bitdepth 1-2-4) from array into the scanline

 	 * <p>

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

-	 * 

+	 *

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

 	 */

 	public static int[] pack(ImageInfo imgInfo, int[] src, int[] dst, boolean scale) {

diff --git a/src/jogl/classes/jogamp/opengl/util/pngj/ImageLines.java b/src/jogl/classes/jogamp/opengl/util/pngj/ImageLines.java
index feb50e7b6..fb2cf5910 100644
--- a/src/jogl/classes/jogamp/opengl/util/pngj/ImageLines.java
+++ b/src/jogl/classes/jogamp/opengl/util/pngj/ImageLines.java
@@ -5,7 +5,7 @@ import jogamp.opengl.util.pngj.ImageLine.SampleType;
 /**
  * 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)}
@@ -28,7 +28,7 @@ public class ImageLines {
 	 * Allocates a matrix to store {@code nRows} image rows. See
 	 * {@link ImageLine} and {@link PngReader#readRowsInt()}
 	 * {@link PngReader#readRowsByte()}
-	 * 
+	 *
 	 * @param imgInfo
 	 * @param stype
 	 * @param unpackedMode
@@ -77,7 +77,7 @@ public class ImageLines {
 
 	/**
 	 * Converts from matrix row number (0 : nRows-1) to image row number
-	 * 
+	 *
 	 * @param mrow
 	 *            Matrix row number
 	 * @return Image row number. Invalid only if mrow is invalid
@@ -88,7 +88,7 @@ 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
diff --git a/src/jogl/classes/jogamp/opengl/util/pngj/PngHelperInternal.java b/src/jogl/classes/jogamp/opengl/util/pngj/PngHelperInternal.java
index a950c6b33..9e64c3eb1 100644
--- a/src/jogl/classes/jogamp/opengl/util/pngj/PngHelperInternal.java
+++ b/src/jogl/classes/jogamp/opengl/util/pngj/PngHelperInternal.java
@@ -49,7 +49,7 @@ public class PngHelperInternal {
 

 	/**

 	 * -1 if eof

-	 * 

+	 *

 	 * PNG uses "network byte order"

 	 */

 	public static int readInt2(InputStream is) {

@@ -186,6 +186,7 @@ public class PngHelperInternal {
 	}

 

 	private static final ThreadLocal<CRC32> crcProvider = new ThreadLocal<CRC32>() {

+		@Override

 		protected CRC32 initialValue() {

 			return new CRC32();

 		}

diff --git a/src/jogl/classes/jogamp/opengl/util/pngj/PngReader.java b/src/jogl/classes/jogamp/opengl/util/pngj/PngReader.java
index e42dd8733..0412beb8c 100644
--- a/src/jogl/classes/jogamp/opengl/util/pngj/PngReader.java
+++ b/src/jogl/classes/jogamp/opengl/util/pngj/PngReader.java
@@ -92,13 +92,13 @@ public class PngReader {
 	 * Constructs a PngReader from an InputStream.
 	 * <p>
 	 * See also <code>FileHelper.createPngReader(File f)</code> if available.
-	 * 
+	 *
 	 * Reads only the signature and first chunk (IDHR)
-	 * 
+	 *
 	 * @param filenameOrDescription
 	 *            : Optional, can be a filename or a description. Just for
 	 *            error/debug messages
-	 * 
+	 *
 	 */
 	public PngReader(InputStream inputStream, String filenameOrDescription) {
 		this.filename = filenameOrDescription == null ? "" : filenameOrDescription;
@@ -411,7 +411,7 @@ public class PngReader {
 
 	/**
 	 * Determines which ancillary chunks (metada) are to be loaded
-	 * 
+	 *
 	 * @param chunkLoadBehaviour
 	 *            {@link ChunkLoadBehaviour}
 	 */
@@ -427,7 +427,7 @@ public class PngReader {
 	 * replaced by a single dummy-marker IDAT chunk. These might be copied to
 	 * the PngWriter
 	 * <p>
-	 * 
+	 *
 	 * @see #getMetadata()
 	 */
 	public ChunksList getChunksList() {
@@ -442,7 +442,7 @@ public class PngReader {
 
 	/**
 	 * High level wrapper over chunksList
-	 * 
+	 *
 	 * @see #getChunksList()
 	 */
 	public PngMetadata getMetadata() {
@@ -456,7 +456,7 @@ public class PngReader {
 	 * appropiate readRowInt/readRowByte
 	 * <p>
 	 * In general, specifying the concrete readRowInt/readRowByte is preferrable
-	 * 
+	 *
 	 * @see #readRowInt(int) {@link #readRowByte(int)}
 	 */
 	public ImageLine readRow(int nrow) {
@@ -468,9 +468,9 @@ public class PngReader {
 	/**
 	 * Reads the row as INT, storing it in the {@link #imgLine} property and
 	 * returning it.
-	 * 
+	 *
 	 * The row must be greater or equal than the last read row.
-	 * 
+	 *
 	 * @param nrow
 	 *            Row number, from 0 to rows-1. Increasing order.
 	 * @return ImageLine object, also available as field. Data is in
@@ -490,10 +490,10 @@ public class PngReader {
 	/**
 	 * Reads the row as BYTES, storing it in the {@link #imgLine} property and
 	 * returning it.
-	 * 
+	 *
 	 * The row must be greater or equal than the last read row. This method
 	 * allows to pass the same row that was last read.
-	 * 
+	 *
 	 * @param nrow
 	 *            Row number, from 0 to rows-1. Increasing order.
 	 * @return ImageLine object, also available as field. Data is in
@@ -524,13 +524,13 @@ public class PngReader {
 	 * <p>
 	 * If the bitdepth is less than 8, the bytes are packed - unless
 	 * {@link #unpackedMode} is true.
-	 * 
+	 *
 	 * @param buffer
 	 *            Prealocated buffer, or null.
 	 * @param nrow
 	 *            Row number (0 is top). Most be strictly greater than the last
 	 *            read row.
-	 * 
+	 *
 	 * @return The scanline in the same passwd buffer if it was allocated, a
 	 *         newly allocated one otherwise
 	 */
@@ -562,13 +562,13 @@ public class PngReader {
 	 * {@link #unpackedMode} is true. <br>
 	 * If the bitdepth is 16, the least significant byte is lost.
 	 * <p>
-	 * 
+	 *
 	 * @param buffer
 	 *            Prealocated buffer, or null.
 	 * @param nrow
 	 *            Row number (0 is top). Most be strictly greater than the last
 	 *            read row.
-	 * 
+	 *
 	 * @return The scanline in the same passwd buffer if it was allocated, a
 	 *         newly allocated one otherwise
 	 */
@@ -632,9 +632,9 @@ public class PngReader {
 	 * <p>
 	 * Notice that the columns in the matrix is not the pixel width of the
 	 * image, but rather pixels x channels
-	 * 
+	 *
 	 * @see #readRowInt(int) to read about the format of each row
-	 * 
+	 *
 	 * @param rowOffset
 	 *            Number of rows to be skipped
 	 * @param nRows
@@ -678,7 +678,7 @@ public class PngReader {
 
 	/**
 	 * Same as readRowsInt(0, imgInfo.rows, 1)
-	 * 
+	 *
 	 * @see #readRowsInt(int, int, int)
 	 */
 	public ImageLines readRowsInt() {
@@ -696,10 +696,10 @@ public class PngReader {
 	 * <p>
 	 * Notice that the columns in the matrix is not the pixel width of the
 	 * image, but rather pixels x channels
-	 * 
+	 *
 	 * @see #readRowByte(int) to read about the format of each row. Notice that
 	 *      if the bitdepth is 16 this will lose information
-	 * 
+	 *
 	 * @param rowOffset
 	 *            Number of rows to be skipped
 	 * @param nRows
@@ -743,7 +743,7 @@ public class PngReader {
 
 	/**
 	 * Same as readRowsByte(0, imgInfo.rows, 1)
-	 * 
+	 *
 	 * @see #readRowsByte(int, int, int)
 	 */
 	public ImageLines readRowsByte() {
@@ -752,13 +752,13 @@ public class PngReader {
 
 	/*
 	 * For the interlaced case, nrow indicates the subsampled image - the pass must be set already.
-	 * 
+	 *
 	 * This must be called in strict order, both for interlaced or no interlaced.
-	 * 
+	 *
 	 * Updates rowNum.
-	 * 
+	 *
 	 * Leaves raw result in rowb
-	 * 
+	 *
 	 * Returns bytes actually read (not including the filter byte)
 	 */
 	private int readRowRaw(final int nrow) {
@@ -933,7 +933,7 @@ public class PngReader {
 	 * scanline will be sample. This implies more processing and memory, but
 	 * it's the most efficient option if you intend to read individual pixels. <br>
 	 * This option should only be set before start reading.
-	 * 
+	 *
 	 * @param unPackedMode
 	 */
 	public void setUnpackedMode(boolean unPackedMode) {
@@ -951,7 +951,7 @@ public class PngReader {
 	 * Tries to reuse the allocated buffers from other already used PngReader
 	 * object. This will have no effect if the buffers are smaller than necessary.
 	 * It also reuses the inflater.
-	 * 
+	 *
 	 * @param other A PngReader that has already finished reading pixels. Can be null.
 	 */
 	public void reuseBuffersFrom(PngReader other) {
@@ -977,7 +977,7 @@ public class PngReader {
 	/**
 	 * Just for testing. TO be called after ending reading, only if
 	 * initCrctest() was called before start
-	 * 
+	 *
 	 * @return CRC of the raw pixels values
 	 */
 	long getCrctestVal() {
@@ -994,6 +994,7 @@ public class PngReader {
 	/**
 	 * Basic info, for debugging.
 	 */
+	@Override
 	public String toString() { // basic info
 		return "filename=" + filename + " " + imgInfo.toString();
 	}
diff --git a/src/jogl/classes/jogamp/opengl/util/pngj/PngWriter.java b/src/jogl/classes/jogamp/opengl/util/pngj/PngWriter.java
index 3e684a881..2f475aab1 100644
--- a/src/jogl/classes/jogamp/opengl/util/pngj/PngWriter.java
+++ b/src/jogl/classes/jogamp/opengl/util/pngj/PngWriter.java
@@ -88,7 +88,7 @@ public class PngWriter {
 	 * filters) and queue chunks before start writing the pixels.

 	 * <p>

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

-	 * 

+	 *

 	 * @param outputStream

 	 *            Opened stream for binary writing

 	 * @param imgInfo

@@ -422,7 +422,7 @@ public class PngWriter {
 	 * 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

@@ -439,7 +439,7 @@ public class PngWriter {
 	 * 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

@@ -455,7 +455,7 @@ public class PngWriter {
 	 * <p>

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

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

-	 * 

+	 *

 	 * This must be called after pngw.end()

 	 */

 	public double computeCompressionRatio() {

@@ -512,7 +512,7 @@ public class PngWriter {
 	 * This must be called just after constructor, before starting writing.

 	 * <p>

 	 * See also setFilterType()

-	 * 

+	 *

 	 * @param compLevel

 	 *            between 0 and 9 (default:6 , recommended: 6 or more)

 	 */

@@ -528,7 +528,7 @@ public class PngWriter {
 	 * This must be called just after constructor, before starting writing.

 	 * <p>

 	 * See also setCompLevel()

-	 * 

+	 *

 	 * @param filterType

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

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

@@ -542,7 +542,7 @@ public class PngWriter {
 	 * Sets maximum size of IDAT fragments. This has little effect on

 	 * performance you should rarely call this

 	 * <p>

-	 * 

+	 *

 	 * @param idatMaxSize

 	 *            default=0 : use defaultSize (32K)

 	 */

@@ -572,7 +572,7 @@ public class PngWriter {
 	/**

 	 * 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)

 	 */

 	public void writeRow(ImageLine imgline) {

@@ -581,9 +581,9 @@ public class PngWriter {
 

 	/**

 	 * Writes line. See writeRow(int[] newrow, int rown)

-	 * 

+	 *

 	 * The <tt>packed</tt> flag of the imageline is honoured!

-	 * 

+	 *

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

 	 */

 	public void writeRow(ImageLine imgline, int rownumber) {

@@ -596,7 +596,7 @@ public class PngWriter {
 

 	/**

 	 * Same as writeRow(int[] newrow, int rown), but does not check row number

-	 * 

+	 *

 	 * @param newrow

 	 */

 	public void writeRow(int[] newrow) {

@@ -605,7 +605,7 @@ public class PngWriter {
 

 	/**

 	 * Alias to writeRowInt

-	 * 

+	 *

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

 	 */

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

@@ -624,7 +624,7 @@ public class PngWriter {
 	 * 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)

@@ -642,7 +642,7 @@ 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)

-	 * 

+	 *

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

 	 */

 	public void writeRowByte(byte[] newrow, int rown) {

diff --git a/src/jogl/classes/jogamp/opengl/util/pngj/PngjException.java b/src/jogl/classes/jogamp/opengl/util/pngj/PngjException.java
index 4a45cb5bf..97e24fc73 100644
--- a/src/jogl/classes/jogamp/opengl/util/pngj/PngjException.java
+++ b/src/jogl/classes/jogamp/opengl/util/pngj/PngjException.java
@@ -2,9 +2,9 @@ package jogamp.opengl.util.pngj;
 

 /**

  * Generic exception

- * 

+ *

  * @author Hernan J Gonzalez

- * 

+ *

  */

 public class PngjException extends RuntimeException {

 	private static final long serialVersionUID = 1L;

diff --git a/src/jogl/classes/jogamp/opengl/util/pngj/PngjExceptionInternal.java b/src/jogl/classes/jogamp/opengl/util/pngj/PngjExceptionInternal.java
index c429b893b..5da70de7b 100644
--- a/src/jogl/classes/jogamp/opengl/util/pngj/PngjExceptionInternal.java
+++ b/src/jogl/classes/jogamp/opengl/util/pngj/PngjExceptionInternal.java
@@ -3,9 +3,9 @@ package jogamp.opengl.util.pngj;
 /**

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

  * some issue with the library

- * 

+ *

  * @author Hernan J Gonzalez

- * 

+ *

  */

 public class PngjExceptionInternal extends RuntimeException {

 	private static final long serialVersionUID = 1L;

diff --git a/src/jogl/classes/jogamp/opengl/util/pngj/chunks/ChunkHelper.java b/src/jogl/classes/jogamp/opengl/util/pngj/chunks/ChunkHelper.java
index a995e4481..4e8bf5635 100644
--- a/src/jogl/classes/jogamp/opengl/util/pngj/chunks/ChunkHelper.java
+++ b/src/jogl/classes/jogamp/opengl/util/pngj/chunks/ChunkHelper.java
@@ -47,19 +47,21 @@ public class ChunkHelper {
 	public static final String zTXt = "zTXt";
 
 	private static final ThreadLocal<Inflater> inflaterProvider = new ThreadLocal<Inflater>() {
+		@Override
 		protected Inflater initialValue() {
 			return new Inflater();
 		}
 	};
 
 	private static final ThreadLocal<Deflater> deflaterProvider = new ThreadLocal<Deflater>() {
+		@Override
 		protected Deflater initialValue() {
 			return new Deflater();
 		}
 	};
 
 	/*
-	 * static auxiliary buffer. any method that uses this should synchronize against this 
+	 * static auxiliary buffer. any method that uses this should synchronize against this
 	 */
 	private static byte[] tmpbuffer = new byte[4096];
 
@@ -136,7 +138,7 @@ public class ChunkHelper {
 
 	/**
 	 * Finds position of null byte in array
-	 * 
+	 *
 	 * @param b
 	 * @return -1 if not found
 	 */
@@ -149,7 +151,7 @@ public class ChunkHelper {
 
 	/**
 	 * Decides if a chunk should be loaded, according to a ChunkLoadBehaviour
-	 * 
+	 *
 	 * @param id
 	 * @param behav
 	 * @return true/false
@@ -208,7 +210,7 @@ public class ChunkHelper {
 
 	/**
 	 * Returns only the chunks that "match" the predicate
-	 * 
+	 *
 	 * See also trimList()
 	 */
 	public static List<PngChunk> filterList(List<PngChunk> target, ChunkPredicate predicateKeep) {
@@ -223,7 +225,7 @@ public class ChunkHelper {
 
 	/**
 	 * Remove (in place) the chunks that "match" the predicate
-	 * 
+	 *
 	 * See also filterList
 	 */
 	public static int trimList(List<PngChunk> target, ChunkPredicate predicateRemove) {
@@ -244,10 +246,10 @@ public class ChunkHelper {
 	 * they have same id and (perhaps, if multiple are allowed) if the match
 	 * also in some "internal key" (eg: key for string values, palette for sPLT,
 	 * etc)
-	 * 
+	 *
 	 * Notice that the use of this is optional, and that the PNG standard allows
 	 * Text chunks that have same key
-	 * 
+	 *
 	 * @return true if "equivalent"
 	 */
 	public static final boolean equivalent(PngChunk c1, PngChunk c2) {
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 82ab3bcf9..1fa00380a 100644
--- a/src/jogl/classes/jogamp/opengl/util/pngj/chunks/ChunkLoadBehaviour.java
+++ b/src/jogl/classes/jogamp/opengl/util/pngj/chunks/ChunkLoadBehaviour.java
@@ -15,7 +15,7 @@ public enum ChunkLoadBehaviour {
 	 */

 	LOAD_CHUNK_KNOWN,

 	/**

-	 * 

+	 *

 	 * Load chunk if "known" or "safe to copy".

 	 */

 	LOAD_CHUNK_IF_SAFE,

diff --git a/src/jogl/classes/jogamp/opengl/util/pngj/chunks/ChunkPredicate.java b/src/jogl/classes/jogamp/opengl/util/pngj/chunks/ChunkPredicate.java
index a750ae34f..4695ccf44 100644
--- a/src/jogl/classes/jogamp/opengl/util/pngj/chunks/ChunkPredicate.java
+++ b/src/jogl/classes/jogamp/opengl/util/pngj/chunks/ChunkPredicate.java
@@ -6,7 +6,7 @@ package jogamp.opengl.util.pngj.chunks;
 public interface ChunkPredicate {
 	/**
 	 * The other chunk matches with this one
-	 * 
+	 *
 	 * @param chunk
 	 * @return true if match
 	 */
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 3aba26cca..dcb1958df 100644
--- a/src/jogl/classes/jogamp/opengl/util/pngj/chunks/ChunkRaw.java
+++ b/src/jogl/classes/jogamp/opengl/util/pngj/chunks/ChunkRaw.java
@@ -108,6 +108,7 @@ public class ChunkRaw {
 		return new ByteArrayInputStream(data);

 	}

 

+	@Override

 	public String toString() {

 		return "chunkid=" + ChunkHelper.toString(idbytes) + " len=" + 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 5ce94ff9f..75107d761 100644
--- a/src/jogl/classes/jogamp/opengl/util/pngj/chunks/ChunksList.java
+++ b/src/jogl/classes/jogamp/opengl/util/pngj/chunks/ChunksList.java
@@ -24,7 +24,7 @@ public class ChunksList {
 

 	/**

 	 * All chunks, read (or written)

-	 * 

+	 *

 	 * But IDAT is a single pseudo chunk without data

 	 */

 	protected List<PngChunk> chunks = new ArrayList<PngChunk>();

@@ -37,7 +37,7 @@ public class ChunksList {
 

 	/**

 	 * Keys of processed (read or writen) chunks

-	 * 

+	 *

 	 * @return key:chunk id, val: number of occurrences

 	 */

 	public HashMap<String, Integer> getChunksKeys() {

@@ -59,12 +59,14 @@ public class ChunksList {
 	protected static List<PngChunk> getXById(final List<PngChunk> list, final String id, final String innerid) {

 		if (innerid == null)

 			return ChunkHelper.filterList(list, new ChunkPredicate() {

+				@Override

 				public boolean match(PngChunk c) {

 					return c.id.equals(id);

 				}

 			});

 		else

 			return ChunkHelper.filterList(list, new ChunkPredicate() {

+				@Override

 				public boolean match(PngChunk c) {

 					if (!c.id.equals(id))

 						return false;

@@ -87,7 +89,7 @@ public class ChunksList {
 

 	/**

 	 * All chunks with this ID

-	 * 

+	 *

 	 * @param id

 	 * @return List, empty if none

 	 */

@@ -98,7 +100,7 @@ public class ChunksList {
 	/**

 	 * 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

 	 * @return List, empty if none

@@ -109,7 +111,7 @@ public class ChunksList {
 

 	/**

 	 * Returns only one chunk

-	 * 

+	 *

 	 * @param id

 	 * @return First chunk found, null if not found

 	 */

@@ -146,18 +148,20 @@ public class ChunksList {
 

 	/**

 	 * Finds all chunks "equivalent" to this one

-	 * 

+	 *

 	 * @param c2

 	 * @return Empty if nothing found

 	 */

 	public List<PngChunk> getEquivalent(final PngChunk c2) {

 		return ChunkHelper.filterList(chunks, new ChunkPredicate() {

+			@Override

 			public boolean match(PngChunk c) {

 				return ChunkHelper.equivalent(c, c2);

 			}

 		});

 	}

 

+	@Override

 	public String toString() {

 		return "ChunkList: read: " + chunks.size();

 	}

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 e76456ad4..c502e9071 100644
--- a/src/jogl/classes/jogamp/opengl/util/pngj/chunks/ChunksListForWrite.java
+++ b/src/jogl/classes/jogamp/opengl/util/pngj/chunks/ChunksListForWrite.java
@@ -67,7 +67,7 @@ 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!
@@ -78,9 +78,9 @@ public class ChunksListForWrite extends ChunksList {
 
 	/**
 	 * Adds chunk to queue
-	 * 
+	 *
 	 * Does not check for duplicated or anything
-	 * 
+	 *
 	 * @param c
 	 */
 	public boolean queue(PngChunk c) {
@@ -149,6 +149,7 @@ public class ChunksListForWrite extends ChunksList {
 		return queuedChunks;
 	}
 
+	@Override
 	public String toString() {
 		return "ChunkList: written: " + chunks.size() + " queue: " + queuedChunks.size();
 	}
@@ -156,6 +157,7 @@ public class ChunksListForWrite extends ChunksList {
 	/**
 	 * for debugging
 	 */
+	@Override
 	public String toStringFull() {
 		StringBuilder sb = new StringBuilder(toString());
 		sb.append("\n Written:\n");
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 a45979ec2..6cd86eb98 100644
--- a/src/jogl/classes/jogamp/opengl/util/pngj/chunks/PngChunk.java
+++ b/src/jogl/classes/jogamp/opengl/util/pngj/chunks/PngChunk.java
@@ -248,7 +248,7 @@ public abstract class PngChunk {
 	/**

 	 * 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();

diff --git a/src/jogl/classes/jogamp/opengl/util/pngj/chunks/PngChunkBKGD.java b/src/jogl/classes/jogamp/opengl/util/pngj/chunks/PngChunkBKGD.java
index 4a8502a3d..ea6235432 100644
--- a/src/jogl/classes/jogamp/opengl/util/pngj/chunks/PngChunkBKGD.java
+++ b/src/jogl/classes/jogamp/opengl/util/pngj/chunks/PngChunkBKGD.java
@@ -70,7 +70,7 @@ public class PngChunkBKGD extends PngChunkSingle {
 

 	/**

 	 * Set gray value (0-255 if bitdept=8)

-	 * 

+	 *

 	 * @param gray

 	 */

 	public void setGray(int gray) {

@@ -87,7 +87,7 @@ public class PngChunkBKGD extends PngChunkSingle {
 

 	/**

 	 * Set pallette index

-	 * 

+	 *

 	 */

 	public void setPaletteIndex(int i) {

 		if (!imgInfo.indexed)

@@ -103,7 +103,7 @@ public class PngChunkBKGD extends PngChunkSingle {
 

 	/**

 	 * Set rgb values

-	 * 

+	 *

 	 */

 	public void setRGB(int r, int g, int b) {

 		if (imgInfo.greyscale || imgInfo.indexed)

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 d44250a2f..057f6c25e 100644
--- a/src/jogl/classes/jogamp/opengl/util/pngj/chunks/PngChunkMultiple.java
+++ b/src/jogl/classes/jogamp/opengl/util/pngj/chunks/PngChunkMultiple.java
@@ -19,9 +19,9 @@ public abstract class PngChunkMultiple extends PngChunk {
 	/**

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

 	 * implementation.

-	 * 

+	 *

 	 * This is the right thing to do, normally.

-	 * 

+	 *

 	 * This is important, eg see ChunkList.removeFromList()

 	 */

 

diff --git a/src/jogl/classes/jogamp/opengl/util/pngj/chunks/PngChunkSBIT.java b/src/jogl/classes/jogamp/opengl/util/pngj/chunks/PngChunkSBIT.java
index bc70c6e5e..3a490654a 100644
--- a/src/jogl/classes/jogamp/opengl/util/pngj/chunks/PngChunkSBIT.java
+++ b/src/jogl/classes/jogamp/opengl/util/pngj/chunks/PngChunkSBIT.java
@@ -106,7 +106,7 @@ public class PngChunkSBIT extends PngChunkSingle {
 

 	/**

 	 * Set rgb values

-	 * 

+	 *

 	 */

 	public void setRGB(int r, int g, int b) {

 		if (imgInfo.greyscale || imgInfo.indexed)

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 5247169e0..7df5ba021 100644
--- a/src/jogl/classes/jogamp/opengl/util/pngj/chunks/PngChunkSingle.java
+++ b/src/jogl/classes/jogamp/opengl/util/pngj/chunks/PngChunkSingle.java
@@ -12,6 +12,7 @@ public abstract class PngChunkSingle extends PngChunk {
 		super(id, imgInfo);

 	}

 

+	@Override

 	public final boolean allowsMultiple() {

 		return false;

 	}

diff --git a/src/jogl/classes/jogamp/opengl/util/pngj/chunks/PngChunkTRNS.java b/src/jogl/classes/jogamp/opengl/util/pngj/chunks/PngChunkTRNS.java
index b68776477..867e34861 100644
--- a/src/jogl/classes/jogamp/opengl/util/pngj/chunks/PngChunkTRNS.java
+++ b/src/jogl/classes/jogamp/opengl/util/pngj/chunks/PngChunkTRNS.java
@@ -82,7 +82,7 @@ public class PngChunkTRNS extends PngChunkSingle {
 
 	/**
 	 * Set rgb values
-	 * 
+	 *
 	 */
 	public void setRGB(int r, int g, int b) {
 		if (imgInfo.greyscale || imgInfo.indexed)
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 ecf8b98c3..139603448 100644
--- a/src/jogl/classes/jogamp/opengl/util/pngj/chunks/PngMetadata.java
+++ b/src/jogl/classes/jogamp/opengl/util/pngj/chunks/PngMetadata.java
@@ -41,6 +41,7 @@ public class PngMetadata {
 			throw new PngjException("cannot set chunk : readonly metadata");
 		if (lazyOverwrite) {
 			ChunkHelper.trimList(cl.getQueuedChunks(), new ChunkPredicate() {
+				@Override
 				public boolean match(PngChunk c2) {
 					return ChunkHelper.equivalent(c, c2);
 				}
@@ -87,7 +88,7 @@ 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
 	 */
@@ -105,7 +106,7 @@ 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
 	 */
@@ -133,7 +134,7 @@ public class PngMetadata {
 	/**
 	 * Creates a text chunk and queue it.
 	 * <p>
-	 * 
+	 *
 	 * @param k
 	 *            : key (latin1)
 	 * @param val
@@ -201,7 +202,7 @@ public class PngMetadata {
 
 	/**
 	 * Returns the palette chunk, if present
-	 * 
+	 *
 	 * @return null if not present
 	 */
 	public PngChunkPLTE getPLTE() {
@@ -220,7 +221,7 @@ public class PngMetadata {
 
 	/**
 	 * Returns the TRNS chunk, if present
-	 * 
+	 *
 	 * @return null if not present
 	 */
 	public PngChunkTRNS getTRNS() {