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

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

+

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

+

+/**

+ * PNG chunk type (abstract) that allows multiple instances in same image.

+ */

+public abstract class PngChunkMultiple extends PngChunk {

+

+	protected PngChunkMultiple(String id, ImageInfo imgInfo) {

+		super(id, imgInfo);

+	}

+

+	@Override

+	public final boolean allowsMultiple() {

+		return true;

+	}

+

+	/**

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

+	 */

+

+}