Deleted a test that's wrong by design.
The Adobe and Ghostscript formulas for converting
CMYK to RGB are fundamentally designed to give
different outputs, it is meaningless to test
them against each other and expect the same results.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/sanselan/trunk@1228802 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/commons/sanselan/color/ColorConversions.java b/src/main/java/org/apache/commons/sanselan/color/ColorConversions.java
index 92ed548..df453fa 100644
--- a/src/main/java/org/apache/commons/sanselan/color/ColorConversions.java
+++ b/src/main/java/org/apache/commons/sanselan/color/ColorConversions.java
@@ -209,6 +209,12 @@
public static final int convertCMYtoRGB(ColorCmy cmy)
{
+ // From Ghostscript's gdevcdj.c:
+ // * Ghostscript: R = (1.0 - C) * (1.0 - K)
+ // * Adobe: R = 1.0 - min(1.0, C + K)
+ // and similarly for G and B.
+ // This is Ghostscript's formula with K = 0.
+
// CMY values = 0 ÷ 1
// RGB values = 0 ÷ 255
@@ -516,7 +522,7 @@
return convertRGBtoRGB(R, G, B);
}
- public static final int convertCMYKtoRGB_old(int sc, int sm, int sy, int sk)
+ public static final int convertCMYKtoRGB_Adobe(int sc, int sm, int sy, int sk)
// throws ImageReadException, IOException
{
int red = 255 - (sc + sk);
diff --git a/src/test/java/org/apache/commons/sanselan/color/ColorConversionsTest.java b/src/test/java/org/apache/commons/sanselan/color/ColorConversionsTest.java
index 5069ff8..900ab48 100644
--- a/src/test/java/org/apache/commons/sanselan/color/ColorConversionsTest.java
+++ b/src/test/java/org/apache/commons/sanselan/color/ColorConversionsTest.java
@@ -35,26 +35,6 @@
0xff7f7f7f,
};
- public void testCMYKtoRGB() throws Exception
- {
- for (int C = 0; C <= 256; C += 64)
- {
- for (int M = 0; M <= 256; M += 64)
- {
- for (int Y = 0; Y <= 256; Y += 64)
- {
- for (int K = 0; K <= 256; K += 64)
- {
- int rgb1 = ColorConversions.convertCMYKtoRGB(Math.min(255, C), Math.min(255, M), Math.min(255, Y), Math.min(255, K));
- int rgb2 = ColorConversions.convertCMYKtoRGB_old(Math.min(255, C), Math.min(255, M), Math.min(255, Y), Math.min(255, K));
-
- assertEquals(new ColorCmyk(C, M, Y, K).toString(), Integer.toHexString(rgb1).toUpperCase(), Integer.toHexString(rgb2).toUpperCase());
- }
- }
- }
- }
- }
-
public void testRGBtoCMYK() throws Exception
{
for (int i = 0; i < SAMPLE_RGBS.length; i++)
