From 47ab16457a9cd6ae8cac807aaea7e923c747b462 Mon Sep 17 00:00:00 2001 From: Harald Kuhr Date: Wed, 16 Feb 2011 22:15:18 +0100 Subject: [PATCH] Renamed CS constant to be more consistent. --- .../java/com/twelvemonkeys/imageio/color/ColorSpaces.java | 6 +++--- .../com/twelvemonkeys/imageio/color/ColorSpacesTest.java | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/color/ColorSpaces.java b/imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/color/ColorSpaces.java index d1975341..f30c095f 100644 --- a/imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/color/ColorSpaces.java +++ b/imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/color/ColorSpaces.java @@ -51,7 +51,7 @@ public final class ColorSpaces { // NOTE: java.awt.color.ColorSpace.CS_* uses 1000-1004, we'll use 5000+ to not interfere with future additions /** The Adobe RGB 1998 (or compatible) color space. Either read from disk or built-in. */ - public static final int CS_ADOBE_RGB_98 = 5000; + public static final int CS_ADOBE_RGB_1998 = 5000; /** A best-effort "generic" CMYK color space. Either read from disk or built-in. */ public static final int CS_GENERIC_CMYK = 5001; @@ -175,7 +175,7 @@ public final class ColorSpaces { * @return the {@link ColorSpace} specified by the color space constant. * @throws IllegalArgumentException if {@code colorSpace} is not one of the defined color spaces ({@code CS_*}). * @see ColorSpace - * @see ColorSpaces#CS_ADOBE_RGB_98 + * @see ColorSpaces#CS_ADOBE_RGB_1998 * @see ColorSpaces#CS_GENERIC_CMYK */ public static ColorSpace getColorSpace(int colorSpace) { @@ -188,7 +188,7 @@ public final class ColorSpaces { case ColorSpace.CS_LINEAR_RGB: return ColorSpace.getInstance(colorSpace); - case CS_ADOBE_RGB_98: + case CS_ADOBE_RGB_1998: // TODO: Read profile specified by config file instead of hard coded try { // This works for OS X only diff --git a/imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/color/ColorSpacesTest.java b/imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/color/ColorSpacesTest.java index 095652d8..9dddc7aa 100644 --- a/imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/color/ColorSpacesTest.java +++ b/imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/color/ColorSpacesTest.java @@ -121,18 +121,18 @@ public class ColorSpacesTest { @Test public void testAdobeRGB98NotNull() { - assertNotNull(ColorSpaces.getColorSpace(ColorSpaces.CS_ADOBE_RGB_98)); + assertNotNull(ColorSpaces.getColorSpace(ColorSpaces.CS_ADOBE_RGB_1998)); } @Test public void testAdobeRGB98IsTypeRGB() { - assertEquals(ColorSpace.TYPE_RGB, ColorSpaces.getColorSpace(ColorSpaces.CS_ADOBE_RGB_98).getType()); + assertEquals(ColorSpace.TYPE_RGB, ColorSpaces.getColorSpace(ColorSpaces.CS_ADOBE_RGB_1998).getType()); } @Test public void testAdobeRGB98AlwaysSame() { - ColorSpace cs = ColorSpaces.getColorSpace(ColorSpaces.CS_ADOBE_RGB_98); - assertSame(cs, ColorSpaces.getColorSpace(ColorSpaces.CS_ADOBE_RGB_98)); + ColorSpace cs = ColorSpaces.getColorSpace(ColorSpaces.CS_ADOBE_RGB_1998); + assertSame(cs, ColorSpaces.getColorSpace(ColorSpaces.CS_ADOBE_RGB_1998)); if (cs instanceof ICC_ColorSpace) { ICC_ColorSpace iccCs = (ICC_ColorSpace) cs;