Merge branch 'master' into stash_glyphcache

Conflicts:
	make/scripts/tests.sh
	src/jogl/classes/com/jogamp/graph/curve/OutlineShape.java
	src/jogl/classes/com/jogamp/graph/curve/Region.java
	src/jogl/classes/com/jogamp/graph/curve/opengl/GLRegion.java
	src/jogl/classes/com/jogamp/graph/curve/opengl/RegionRenderer.java
	src/jogl/classes/com/jogamp/graph/curve/opengl/Renderer.java
	src/jogl/classes/com/jogamp/graph/curve/opengl/TextRenderer.java
	src/jogl/classes/com/jogamp/graph/font/Font.java
	src/jogl/classes/com/jogamp/opengl/math/VectorUtil.java
	src/jogl/classes/jogamp/graph/curve/text/GlyphShape.java
	src/jogl/classes/jogamp/graph/curve/text/GlyphString.java
	src/jogl/classes/jogamp/graph/font/typecast/TypecastFont.java
	src/jogl/classes/jogamp/graph/font/typecast/TypecastGlyph.java
	src/jogl/classes/jogamp/graph/font/typecast/TypecastRenderer.java

1 files changed, 24 insertions, 6 deletions

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 a3f85355c..1fa00380a 100644
--- a/src/jogl/classes/jogamp/opengl/util/pngj/chunks/ChunkLoadBehaviour.java
+++ b/src/jogl/classes/jogamp/opengl/util/pngj/chunks/ChunkLoadBehaviour.java
@@ -1,10 +1,28 @@
 package jogamp.opengl.util.pngj.chunks;

 

+/**

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

+ * when reading

+ */

 public enum ChunkLoadBehaviour {

-	// what to do with non critical chunks when reading?

-	LOAD_CHUNK_NEVER, /* ignore non-critical chunks */

-	LOAD_CHUNK_KNOWN, /* load chunk if 'known' */

-	LOAD_CHUNK_IF_SAFE, /* load chunk if 'known' or safe to copy */

-	LOAD_CHUNK_ALWAYS /* load chunk always */

-	;

+	/**

+	 * All non-critical chunks are skipped

+	 */

+	LOAD_CHUNK_NEVER,

+	/**

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

+	 * factory).

+	 */

+	LOAD_CHUNK_KNOWN,

+	/**

+	 *

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

+	 */

+	LOAD_CHUNK_IF_SAFE,

+	/**

+	 * Load all chunks. <br>

+	 * Notice that other restrictions might apply, see

+	 * PngReader.skipChunkMaxSize PngReader.skipChunkIds

+	 */

+	LOAD_CHUNK_ALWAYS;

 }