1 files changed, 18 insertions, 17 deletions
diff --git a/src/jogl/classes/jogamp/opengl/util/pngj/chunks/PngChunkICCP.java b/src/jogl/classes/jogamp/opengl/util/pngj/chunks/PngChunkICCP.java
index db1c1ba64..399577d72 100644
--- a/src/jogl/classes/jogamp/opengl/util/pngj/chunks/PngChunkICCP.java
+++ b/src/jogl/classes/jogamp/opengl/util/pngj/chunks/PngChunkICCP.java
@@ -1,31 +1,32 @@
 package jogamp.opengl.util.pngj.chunks;
 
 import jogamp.opengl.util.pngj.ImageInfo;
-import jogamp.opengl.util.pngj.PngHelper;
+import jogamp.opengl.util.pngj.PngHelperInternal;
+import jogamp.opengl.util.pngj.PngjException;
 
-/*
+/**
+ * iCCP chunk.
+ * <p>
+ * see http://www.w3.org/TR/PNG/#11iCCP
  */
-public class PngChunkICCP extends PngChunk {
+public class PngChunkICCP extends PngChunkSingle {
+	public final static String ID = ChunkHelper.iCCP;
+
 	// http://www.w3.org/TR/PNG/#11iCCP
 	private String profileName;
 	private byte[] compressedProfile; // copmression/decopmresion is done in getter/setter
 
 	public PngChunkICCP(ImageInfo info) {
-		super(ChunkHelper.iCCP, info);
-	}
-
-	@Override
-	public boolean mustGoBeforeIDAT() {
-		return true;
+		super(ID, info);
 	}
 
 	@Override
-	public boolean mustGoBeforePLTE() {
-		return true;
+	public ChunkOrderingConstraint getOrderingConstraint() {
+		return ChunkOrderingConstraint.BEFORE_PLTE_AND_IDAT;
 	}
 
 	@Override
-	public ChunkRaw createChunk() {
+	public ChunkRaw createRawChunk() {
 		ChunkRaw c = createEmptyChunk(profileName.length() + compressedProfile.length + 2, true);
 		System.arraycopy(ChunkHelper.toBytes(profileName), 0, c.data, 0, profileName.length());
 		c.data[profileName.length()] = 0;
@@ -35,12 +36,12 @@ public class PngChunkICCP extends PngChunk {
 	}
 
 	@Override
-	public void parseFromChunk(ChunkRaw chunk) {
+	public void parseFromRaw(ChunkRaw chunk) {
 		int pos0 = ChunkHelper.posNullByte(chunk.data);
-		profileName = new String(chunk.data, 0, pos0, PngHelper.charsetLatin1);
+		profileName = new String(chunk.data, 0, pos0, PngHelperInternal.charsetLatin1);
 		int comp = (chunk.data[pos0 + 1] & 0xff);
 		if (comp != 0)
-			throw new RuntimeException("bad compression for ChunkTypeICCP");
+			throw new PngjException("bad compression for ChunkTypeICCP");
 		int compdatasize = chunk.data.length - (pos0 + 2);
 		compressedProfile = new byte[compdatasize];
 		System.arraycopy(chunk.data, pos0 + 2, compressedProfile, 0, compdatasize);
@@ -64,7 +65,7 @@ public class PngChunkICCP extends PngChunk {
 	}
 
 	public void setProfileNameAndContent(String name, String profile) {
-		setProfileNameAndContent(name, profile.getBytes(PngHelper.charsetLatin1));
+		setProfileNameAndContent(name, profile.getBytes(PngHelperInternal.charsetLatin1));
 	}
 
 	public String getProfileName() {
@@ -79,7 +80,7 @@ public class PngChunkICCP extends PngChunk {
 	}
 
 	public String getProfileAsString() {
-		return new String(getProfile(), PngHelper.charsetLatin1);
+		return new String(getProfile(), PngHelperInternal.charsetLatin1);
 	}
 
 }