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, 41 insertions, 0 deletions

diff --git a/src/jogl/classes/jogamp/opengl/util/pngj/chunks/PngChunkSkipped.java b/src/jogl/classes/jogamp/opengl/util/pngj/chunks/PngChunkSkipped.java
new file mode 100644
index 000000000..f4c77b4e1
--- /dev/null
+++ b/src/jogl/classes/jogamp/opengl/util/pngj/chunks/PngChunkSkipped.java
@@ -0,0 +1,41 @@
+package jogamp.opengl.util.pngj.chunks;

+

+import jogamp.opengl.util.pngj.ImageInfo;

+import jogamp.opengl.util.pngj.PngjException;

+

+/**

+ * Pseudo chunk type, for chunks that were skipped on reading

+ */

+public class PngChunkSkipped extends PngChunk {

+

+	public PngChunkSkipped(String id, ImageInfo info, int clen) {

+		super(id, info);

+		this.length = clen;

+	}

+

+	@Override

+	public ChunkOrderingConstraint getOrderingConstraint() {

+		return ChunkOrderingConstraint.NONE;

+	}

+

+	@Override

+	public ChunkRaw createRawChunk() {

+		throw new PngjException("Non supported for a skipped chunk");

+	}

+

+	@Override

+	public void parseFromRaw(ChunkRaw c) {

+		throw new PngjException("Non supported for a skipped chunk");

+	}

+

+	@Override

+	public void cloneDataFromRead(PngChunk other) {

+		throw new PngjException("Non supported for a skipped chunk");

+	}

+

+	@Override

+	public boolean allowsMultiple() {

+		return true;

+	}

+

+}