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, 13 insertions, 8 deletions

diff --git a/src/jogl/classes/jogamp/opengl/util/pngj/chunks/PngChunkUNKNOWN.java b/src/jogl/classes/jogamp/opengl/util/pngj/chunks/PngChunkUNKNOWN.java
index 15a35935a..3803428e6 100644
--- a/src/jogl/classes/jogamp/opengl/util/pngj/chunks/PngChunkUNKNOWN.java
+++ b/src/jogl/classes/jogamp/opengl/util/pngj/chunks/PngChunkUNKNOWN.java
@@ -2,7 +2,12 @@ package jogamp.opengl.util.pngj.chunks;
 

 import jogamp.opengl.util.pngj.ImageInfo;

 

-public class PngChunkUNKNOWN extends PngChunk { // unkown, custom or not

+/**

+ * Placeholder for UNKNOWN (custom or not) chunks.

+ * <p>

+ * For PngReader, a chunk is unknown if it's not registered in the chunk factory

+ */

+public class PngChunkUNKNOWN extends PngChunkMultiple { // unkown, custom or not

 

 	private byte[] data;

 

@@ -10,25 +15,25 @@ public class PngChunkUNKNOWN extends PngChunk { // unkown, custom or not
 		super(id, info);

 	}

 

-	@Override

-	public boolean allowsMultiple() {

-		return true;

-	}

-

 	private PngChunkUNKNOWN(PngChunkUNKNOWN c, ImageInfo info) {

 		super(c.id, info);

 		System.arraycopy(c.data, 0, data, 0, c.data.length);

 	}

 

 	@Override

-	public ChunkRaw createChunk() {

+	public ChunkOrderingConstraint getOrderingConstraint() {

+		return ChunkOrderingConstraint.NONE;

+	}

+

+	@Override

+	public ChunkRaw createRawChunk() {

 		ChunkRaw p = createEmptyChunk(data.length, false);

 		p.data = this.data;

 		return p;

 	}

 

 	@Override

-	public void parseFromChunk(ChunkRaw c) {

+	public void parseFromRaw(ChunkRaw c) {

 		data = c.data;

 	}