1 files changed, 17 insertions, 11 deletions

diff --git a/src/jogl/classes/jogamp/opengl/util/pngj/chunks/PngChunkZTXT.java b/src/jogl/classes/jogamp/opengl/util/pngj/chunks/PngChunkZTXT.java
index fd6c08273..64593eae4 100644
--- a/src/jogl/classes/jogamp/opengl/util/pngj/chunks/PngChunkZTXT.java
+++ b/src/jogl/classes/jogamp/opengl/util/pngj/chunks/PngChunkZTXT.java
@@ -4,26 +4,32 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;

 

 import jogamp.opengl.util.pngj.ImageInfo;

-import jogamp.opengl.util.pngj.PngHelper;

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

 import jogamp.opengl.util.pngj.PngjException;

 

-

+/**

+ * zTXt chunk.

+ * <p>

+ * see http://www.w3.org/TR/PNG/#11zTXt

+ */

 public class PngChunkZTXT extends PngChunkTextVar {

+	public final static String ID = ChunkHelper.zTXt;

+

 	// http://www.w3.org/TR/PNG/#11zTXt

 	public PngChunkZTXT(ImageInfo info) {

-		super(ChunkHelper.zTXt, info);

+		super(ID, info);

 	}

 

 	@Override

-	public ChunkRaw createChunk() {

-		if (val.isEmpty() || key.isEmpty())

-			return null;

+	public ChunkRaw createRawChunk() {

+		if (key.isEmpty())

+			throw new PngjException("Text chunk key must be non empty");

 		try {

 			ByteArrayOutputStream ba = new ByteArrayOutputStream();

-			ba.write(key.getBytes(PngHelper.charsetLatin1));

+			ba.write(key.getBytes(PngHelperInternal.charsetLatin1));

 			ba.write(0); // separator

 			ba.write(0); // compression method: 0

-			byte[] textbytes = ChunkHelper.compressBytes(val.getBytes(PngHelper.charsetLatin1), true);

+			byte[] textbytes = ChunkHelper.compressBytes(val.getBytes(PngHelperInternal.charsetLatin1), true);

 			ba.write(textbytes);

 			byte[] b = ba.toByteArray();

 			ChunkRaw chunk = createEmptyChunk(b.length, false);

@@ -35,7 +41,7 @@ public class PngChunkZTXT extends PngChunkTextVar {
 	}

 

 	@Override

-	public void parseFromChunk(ChunkRaw c) {

+	public void parseFromRaw(ChunkRaw c) {

 		int nullsep = -1;

 		for (int i = 0; i < c.data.length; i++) { // look for first zero

 			if (c.data[i] != 0)

@@ -45,12 +51,12 @@ public class PngChunkZTXT extends PngChunkTextVar {
 		}

 		if (nullsep < 0 || nullsep > c.data.length - 2)

 			throw new PngjException("bad zTXt chunk: no separator found");

-		key = new String(c.data, 0, nullsep, PngHelper.charsetLatin1);

+		key = new String(c.data, 0, nullsep, PngHelperInternal.charsetLatin1);

 		int compmet = (int) c.data[nullsep + 1];

 		if (compmet != 0)

 			throw new PngjException("bad zTXt chunk: unknown compression method");

 		byte[] uncomp = ChunkHelper.compressBytes(c.data, nullsep + 2, c.data.length - nullsep - 2, false); // uncompress

-		val = new String(uncomp, PngHelper.charsetLatin1);

+		val = new String(uncomp, PngHelperInternal.charsetLatin1);

 	}

 

 	@Override