+ * Standard ICC color profiles are read from system-specific locations + * for known operating systems. + *
+ *+ * Color profiles may be configured by placing a property-file + * {@code com/twelvemonkeys/imageio/color/icc_profiles.properties} + * on the classpath, specifying the full path to the profiles. + * ICC color profiles are probably already present on your system, or + * can be downloaded from + * ICC, + * Adobe or other places. + * *
+ *+ * Example property file: + *
+ *+ * # icc_profiles.properties + * ADOBE_RGB_1998=/path/to/Adobe RGB 1998.icc + * GENERIC_CMYK=/path/to/Generic CMYK.icc + *+ * + * @author Harald Kuhr + * @author last modified by $Author: haraldk$ + * @version $Id: ColorSpaces.java,v 1.0 24.01.11 17.51 haraldk Exp$ + */ +public final class ColorProfiles { + /** + * We need special ICC profile handling for KCMS vs LCMS. Delegate to specific strategy. + */ + private final static ICCProfileSanitizer profileCleaner = ICCProfileSanitizer.Factory.get(); + + static final int ICC_PROFILE_MAGIC = 'a' << 24 | 'c' << 16 | 's' << 8 | 'p'; + static final int ICC_PROFILE_HEADER_SIZE = 128; + + static { + // In case we didn't activate through SPI already + ProfileDeferralActivator.activateProfiles(); + } + + private ColorProfiles() { + } + + static byte[] getProfileHeaderWithProfileId(final ICC_Profile profile) { + // Get *entire profile data*... :-/ + return getProfileHeaderWithProfileId(profile.getData()); + } + + static byte[] getProfileHeaderWithProfileId(byte[] data) { + // ICC profile header is the first 128 bytes + byte[] header = Arrays.copyOf(data, ICC_PROFILE_HEADER_SIZE); + + // Clear out preferred CMM, platform & creator, as these don't affect the profile in any way + // - LCMS updates CMM + creator to "lcms" and platform to current platform + // - KCMS keeps the values in the file... + Arrays.fill(header, ICC_Profile.icHdrCmmId, ICC_Profile.icHdrCmmId + 4, (byte) 0); + Arrays.fill(header, ICC_Profile.icHdrPlatform, ICC_Profile.icHdrPlatform + 4, (byte) 0); + // + Clear out rendering intent, as this may be updated by application + Arrays.fill(header, ICC_Profile.icHdrRenderingIntent, ICC_Profile.icHdrRenderingIntent + 4, (byte) 0); + Arrays.fill(header, ICC_Profile.icHdrCreator, ICC_Profile.icHdrCreator + 4, (byte) 0); + + // Clear out any existing MD5, as it is no longer correct + Arrays.fill(header, ICC_Profile.icHdrProfileID, ICC_Profile.icHdrProfileID + 16, (byte) 0); + + // Generate new MD5 and store in header + byte[] md5 = computeMD5(header, data); + System.arraycopy(md5, 0, header, ICC_Profile.icHdrProfileID, md5.length); + + return header; + } + + private static byte[] computeMD5(byte[] header, byte[] data) { + try { + MessageDigest digest = MessageDigest.getInstance("MD5"); + digest.update(header, 0, ICC_PROFILE_HEADER_SIZE); + digest.update(data, ICC_PROFILE_HEADER_SIZE, data.length - ICC_PROFILE_HEADER_SIZE); + return digest.digest(); + } + catch (NoSuchAlgorithmException e) { + throw new IllegalStateException("Missing MD5 MessageDigest"); + } + } + + /** + * Tests whether an ICC color profile is equal to the default sRGB profile. + * + * @param profile the ICC profile to test. May not be {@code null}. + * @return {@code true} if {@code profile} is equal to the default sRGB profile. + * @throws IllegalArgumentException if {@code profile} is {@code null} + * @see java.awt.color.ColorSpace#CS_sRGB + * @see java.awt.color.ColorSpace#isCS_sRGB() + */ + public static boolean isCS_sRGB(final ICC_Profile profile) { + Validate.notNull(profile, "profile"); + + return profile.getColorSpaceType() == ColorSpace.TYPE_RGB && Arrays.equals(getProfileHeaderWithProfileId(profile), sRGB.header); + } + + /** + * Tests whether an ICC color profile is equal to the default GRAY profile. + * + * @param profile the ICC profile to test. May not be {@code null}. + * @return {@code true} if {@code profile} is equal to the default GRAY profile. + * @throws IllegalArgumentException if {@code profile} is {@code null} + * @see java.awt.color.ColorSpace#CS_GRAY + */ + public static boolean isCS_GRAY(final ICC_Profile profile) { + Validate.notNull(profile, "profile"); + + return profile.getColorSpaceType() == ColorSpace.TYPE_GRAY && Arrays.equals(getProfileHeaderWithProfileId(profile), GRAY.header); + } + + /** + * Tests whether an ICC color profile is known to cause problems for {@link java.awt.image.ColorConvertOp}. + *
+ * + * Note that this method only tests if a color conversion using this profile is known to fail. + * There's no guarantee that the color conversion will succeed even if this method returns {@code false}. + * + *
+ * + * @param profile the ICC color profile. May not be {@code null}. + * @return {@code true} if known to be offending, {@code false} otherwise + * @throws IllegalArgumentException if {@code profile} is {@code null} + */ + static boolean isOffendingColorProfile(final ICC_Profile profile) { + Validate.notNull(profile, "profile"); + + // NOTE: + // Several embedded ICC color profiles are non-compliant with Java pre JDK7 and throws CMMException + // The problem with these embedded ICC profiles seems to be the rendering intent + // being 1 (01000000) - "Media Relative Colormetric" in the offending profiles, + // and 0 (00000000) - "Perceptual" in the good profiles + // (that is 1 single bit of difference right there.. ;-) + // See http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7064516 + + // This is particularly annoying, as the byte copying isn't really necessary, + // except the getRenderingIntent method is package protected in java.awt.color + byte[] header = profile.getData(ICC_Profile.icSigHead); + + return header[ICC_Profile.icHdrRenderingIntent] != 0 || header[ICC_Profile.icHdrRenderingIntent + 1] != 0 + || header[ICC_Profile.icHdrRenderingIntent + 2] != 0 || header[ICC_Profile.icHdrRenderingIntent + 3] > 3; + } + + /** + * Tests whether an ICC color profile is valid. + * Invalid profiles are known to cause problems for {@link java.awt.image.ColorConvertOp}. + *+ * + * Note that this method only tests if a color conversion using this profile is known to fail. + * There's no guarantee that the color conversion will succeed even if this method returns {@code false}. + * + *
+ * + * @param profile the ICC color profile. May not be {@code null}. + * @return {@code profile} if valid. + * @throws IllegalArgumentException if {@code profile} is {@code null} + * @throws java.awt.color.CMMException if {@code profile} is invalid. + */ + public static ICC_Profile validateProfile(final ICC_Profile profile) { + // Fix profile before validation + profileCleaner.fixProfile(profile); + ColorSpaces.validateColorSpace(new ICC_ColorSpace(profile)); // TODO: Should use createColorSpace and cache if good? + + return profile; + } + + /** + * Reads an ICC Profile from the given input stream, as-is, with no validation. + * + * This method behaves exactly like {@code ICC_Profile.getInstance(input)}. + * + * @param input the input stream to read from, may not be {@code null} + * @return an {@code ICC_Profile} object as read from the input stream. + * @throws IOException If an I/O error occurs while reading the stream. + * @throws IllegalArgumentException If {@code input} is {@code null} + * or the stream does not contain valid ICC Profile data. + * @see ICC_Profile#getInstance(InputStream) + * @see #readProfile(InputStream) + */ + public static ICC_Profile readProfileRaw(final InputStream input) throws IOException { + Validate.notNull(input, "input"); + + return ICC_Profile.getInstance(input); + } + + /** + * Reads an ICC Profile from the given input stream, with extra validation. + * + * If a matching profile already exists in cache, the cached instance is returned. + * + * @param input the input stream to read from, may not be {@code null} + * @return an {@code ICC_Profile} object as read from the input stream. + * @throws IOException If an I/O error occurs while reading the stream. + * @throws IllegalArgumentException If {@code input} is {@code null} + * or the stream does not contain valid ICC Profile data. + * @see ICC_Profile#getInstance(InputStream) + */ + public static ICC_Profile readProfile(final InputStream input) throws IOException { + Validate.notNull(input, "input"); + + DataInputStream dataInput = new DataInputStream(input); + byte[] header = new byte[ICC_PROFILE_HEADER_SIZE]; + try { + dataInput.readFully(header); + + int size = validateHeaderAndGetSize(header); + byte[] data = Arrays.copyOf(header, size); + dataInput.readFully(data, header.length, size - header.length); + + return createProfile(data); + } + catch (EOFException e) { + throw new IllegalArgumentException("Truncated ICC Profile data", e); + } + } + + /** + * Creates an ICC Profile from the given byte array, as-is, with no validation. + * + * This method behaves exactly like {@code ICC_Profile.getInstance(input)}, + * except that extraneous bytes at the end of the array is ignored. + * + * @param input the byte array to create a profile from, may not be {@code null} + * @return an {@code ICC_Profile} object created from the byte array + * @throws IllegalArgumentException If {@code input} is {@code null} + * or the byte array does not contain valid ICC Profile data. + * @see ICC_Profile#getInstance(byte[]) + * @see #createProfile(byte[]) + */ + public static ICC_Profile createProfileRaw(final byte[] input) { + int size = validateHeaderAndGetSize(input); + + // Unlike the InputStream version, the byte version of ICC_Profile.getInstance() + // does not discard extra bytes at the end. We'll chop them off here for convenience + return ICC_Profile.getInstance(limit(input, size)); + } + + /** + * Reads an ICC Profile from the given byte array, with extra validation. + * Extraneous bytes at the end of the array are ignored. + * + * If a matching profile already exists in cache, the cached instance is returned. + * + * @param input the byte array to create a profile from, may not be {@code null} + * @return an {@code ICC_Profile} object created from the byte array + * @throws IllegalArgumentException If {@code input} is {@code null} + * or the byte array does not contain valid ICC Profile data. + * @see ICC_Profile#getInstance(byte[]) + */ + public static ICC_Profile createProfile(final byte[] input) { + int size = validateAndGetSize(input); + + // Look up in cache before returning, these are already validated + byte[] profileHeader = getProfileHeaderWithProfileId(input); + ICC_Profile internal = getInternalProfile(profileHeader); + if (internal != null) { + return internal; + } + + ICC_ColorSpace cached = ColorSpaces.getCachedCS(profileHeader); + if (cached != null) { + return cached.getProfile(); + } + + ICC_Profile profile = ICC_Profile.getInstance(limit(input, size)); + + // We'll validate & cache by creating a color space and returning its profile... + // TODO: Rewrite with separate cache for profiles... + return ColorSpaces.createColorSpace(profile).getProfile(); + } + + private static byte[] limit(byte[] input, int size) { + return input.length == size ? input : Arrays.copyOf(input, size); + } + + private static int validateAndGetSize(byte[] input) { + int size = validateHeaderAndGetSize(input); + + if (size < 0 || size > input.length) { + throw new IllegalArgumentException("Truncated ICC profile data, length < " + size + ": " + input.length); + } + + return size; + } + + private static int validateHeaderAndGetSize(byte[] input) { + Validate.notNull(input, "input"); + + if (input.length < ICC_PROFILE_HEADER_SIZE) { // Can't be less than size of ICC header + throw new IllegalArgumentException("Truncated ICC profile data, length < 128: " + input.length); + } + + int size = intBigEndian(input, ICC_Profile.icHdrSize); + + if (intBigEndian(input, ICC_Profile.icHdrMagic) != ICC_PROFILE_MAGIC) { + throw new IllegalArgumentException("Not an ICC profile, missing file signature"); + } + + return size; + } + + private static ICC_Profile getInternalProfile(final byte[] profileHeader) { + int profileCSType = getCsType(profileHeader); + + if (profileCSType == ColorSpace.TYPE_RGB && Arrays.equals(profileHeader, ColorProfiles.sRGB.header)) { + return ICC_Profile.getInstance(ColorSpace.CS_sRGB); + } + else if (profileCSType == ColorSpace.TYPE_GRAY && Arrays.equals(profileHeader, ColorProfiles.GRAY.header)) { + return ICC_Profile.getInstance(ColorSpace.CS_GRAY); + } + else if (profileCSType == ColorSpace.TYPE_3CLR && Arrays.equals(profileHeader, ColorProfiles.PYCC.header)) { + return ICC_Profile.getInstance(ColorSpace.CS_PYCC); + } + else if (profileCSType == ColorSpace.TYPE_RGB && Arrays.equals(profileHeader, ColorProfiles.LINEAR_RGB.header)) { + return ICC_Profile.getInstance(ColorSpace.CS_LINEAR_RGB); + } + else if (profileCSType == ColorSpace.TYPE_XYZ && Arrays.equals(profileHeader, ColorProfiles.CIEXYZ.header)) { + return ICC_Profile.getInstance(ColorSpace.CS_CIEXYZ); + } + + return null; + } + + private static int intBigEndian(byte[] data, int index) { + return (data[index] & 0xff) << 24 | (data[index + 1] & 0xff) << 16 | (data[index + 2] & 0xff) << 8 | (data[index + 3] & 0xff); + } + + private static int getCsType(byte[] profileHeader) { + int csSig = intBigEndian(profileHeader, ICC_Profile.icHdrColorSpace); + + switch (csSig) { + case ICC_Profile.icSigXYZData: + return ColorSpace.TYPE_XYZ; + case ICC_Profile.icSigLabData: + return ColorSpace.TYPE_Lab; + case ICC_Profile.icSigLuvData: + return ColorSpace.TYPE_Luv; + case ICC_Profile.icSigYCbCrData: + return ColorSpace.TYPE_YCbCr; + case ICC_Profile.icSigYxyData: + return ColorSpace.TYPE_Yxy; + case ICC_Profile.icSigRgbData: + return ColorSpace.TYPE_RGB; + case ICC_Profile.icSigGrayData: + return ColorSpace.TYPE_GRAY; + case ICC_Profile.icSigHsvData: + return ColorSpace.TYPE_HSV; + case ICC_Profile.icSigHlsData: + return ColorSpace.TYPE_HLS; + case ICC_Profile.icSigCmykData: + return ColorSpace.TYPE_CMYK; + // Note: There is no TYPE_* 10... + case ICC_Profile.icSigCmyData: + return ColorSpace.TYPE_CMY; + case ICC_Profile.icSigSpace2CLR: + return ColorSpace.TYPE_2CLR; + case ICC_Profile.icSigSpace3CLR: + return ColorSpace.TYPE_3CLR; + case ICC_Profile.icSigSpace4CLR: + return ColorSpace.TYPE_4CLR; + case ICC_Profile.icSigSpace5CLR: + return ColorSpace.TYPE_5CLR; + case ICC_Profile.icSigSpace6CLR: + return ColorSpace.TYPE_6CLR; + case ICC_Profile.icSigSpace7CLR: + return ColorSpace.TYPE_7CLR; + case ICC_Profile.icSigSpace8CLR: + return ColorSpace.TYPE_8CLR; + case ICC_Profile.icSigSpace9CLR: + return ColorSpace.TYPE_9CLR; + case ICC_Profile.icSigSpaceACLR: + return ColorSpace.TYPE_ACLR; + case ICC_Profile.icSigSpaceBCLR: + return ColorSpace.TYPE_BCLR; + case ICC_Profile.icSigSpaceCCLR: + return ColorSpace.TYPE_CCLR; + case ICC_Profile.icSigSpaceDCLR: + return ColorSpace.TYPE_DCLR; + case ICC_Profile.icSigSpaceECLR: + return ColorSpace.TYPE_ECLR; + case ICC_Profile.icSigSpaceFCLR: + return ColorSpace.TYPE_FCLR; + default: + throw new IllegalArgumentException("Invalid ICC color space signature: " + csSig); // TODO: fourCC? + } + } + + static ICC_Profile readProfileFromClasspathResource(@SuppressWarnings("SameParameterValue") final String profilePath) { + InputStream stream = ColorSpaces.class.getResourceAsStream(profilePath); + + if (stream != null) { + if (DEBUG) { + System.out.println("Loading profile from classpath resource: " + profilePath); + } + + try { + return ICC_Profile.getInstance(stream); + } + catch (@SuppressWarnings("CatchMayIgnoreException") IOException ignore) { + if (DEBUG) { + ignore.printStackTrace(); + } + } + finally { + FileUtil.close(stream); + } + } + + return null; + } + + static ICC_Profile readProfileFromPath(final String profilePath) { + if (profilePath != null) { + if (DEBUG) { + System.out.println("Loading profile from: " + profilePath); + } + + try { + return ICC_Profile.getInstance(profilePath); + } + catch (@SuppressWarnings("CatchMayIgnoreException") SecurityException | IOException ignore) { + if (DEBUG) { + ignore.printStackTrace(); + } + } + } + + return null; + } + + static void fixProfile(ICC_Profile profile) { + profileCleaner.fixProfile(profile); + } + + static boolean validationAltersProfileHeader() { + return profileCleaner.validationAltersProfileHeader(); + } + + // Cache header profile data to avoid excessive array creation/copying. Use static inner class for on-demand lazy init + static class sRGB { + static final byte[] header = getProfileHeaderWithProfileId(ICC_Profile.getInstance(ColorSpace.CS_sRGB)); + } + + static class CIEXYZ { + static final byte[] header = getProfileHeaderWithProfileId(ICC_Profile.getInstance(ColorSpace.CS_CIEXYZ)); + } + + static class PYCC { + static final byte[] header = getProfileHeaderWithProfileId(ICC_Profile.getInstance(ColorSpace.CS_PYCC)); + } + + static class GRAY { + static final byte[] header = getProfileHeaderWithProfileId(ICC_Profile.getInstance(ColorSpace.CS_GRAY)); + } + + static class LINEAR_RGB { + static final byte[] header = getProfileHeaderWithProfileId(ICC_Profile.getInstance(ColorSpace.CS_LINEAR_RGB)); + } + + static class Profiles { + // TODO: Honour java.iccprofile.path property? + private static final Properties PROFILES = loadProfiles(); + + private static Properties loadProfiles() { + Properties systemDefaults; + + try { + systemDefaults = SystemUtil.loadProperties(ColorSpaces.class, "com/twelvemonkeys/imageio/color/icc_profiles_" + Platform.os().id()); + } + catch (@SuppressWarnings("CatchMayIgnoreException") SecurityException | IOException ignore) { + System.err.printf( + "Warning: Could not load system default ICC profile locations from %s, will use bundled fallback profiles.\n", + ignore.getMessage() + ); + + if (DEBUG) { + ignore.printStackTrace(); + } + + systemDefaults = null; + } + + // Create map with defaults and add user overrides if any + Properties profiles = new Properties(systemDefaults); + + try { + Properties userOverrides = SystemUtil.loadProperties( + ColorSpaces.class, + "com/twelvemonkeys/imageio/color/icc_profiles" + ); + profiles.putAll(userOverrides); + } + catch (SecurityException | IOException ignore) { + // Most likely, this file won't be there + } + + if (DEBUG) { + System.out.println("User ICC profiles: " + profiles); + System.out.println("System ICC profiles : " + systemDefaults); + } + + return profiles; + } + + static String getPath(final String profileName) { + return PROFILES.getProperty(profileName); + } + } +} 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 8e3964c7..fce1da68 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 @@ -30,24 +30,17 @@ package com.twelvemonkeys.imageio.color; -import com.twelvemonkeys.io.FileUtil; -import com.twelvemonkeys.lang.Platform; -import com.twelvemonkeys.lang.SystemUtil; import com.twelvemonkeys.lang.Validate; import com.twelvemonkeys.util.LRUHashMap; import java.awt.color.ColorSpace; import java.awt.color.ICC_ColorSpace; import java.awt.color.ICC_Profile; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; import java.lang.ref.WeakReference; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; import java.util.Arrays; import java.util.Map; -import java.util.Properties; + +import static com.twelvemonkeys.imageio.color.ColorProfiles.*; /** * A helper class for working with ICC color profiles and color spaces. @@ -84,9 +77,6 @@ public final class ColorSpaces { final static boolean DEBUG = "true".equalsIgnoreCase(System.getProperty("com.twelvemonkeys.imageio.color.debug")); - /** We need special ICC profile handling for KCMS vs LCMS. Delegate to specific strategy. */ - private final static ICCProfileSanitizer profileCleaner = ICCProfileSanitizer.Factory.get(); - // 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. */ @@ -97,14 +87,13 @@ public final class ColorSpaces { @SuppressWarnings("WeakerAccess") public static final int CS_GENERIC_CMYK = 5001; - static final int ICC_PROFILE_HEADER_SIZE = 128; - + // TODO: Move to ColorProfiles OR cache ICC_ColorSpace instead? // Weak references to hold the color spaces while cached private static WeakReference- * - * Note that this method only tests if a color conversion using this profile is known to fail. - * There's no guarantee that the color conversion will succeed even if this method returns {@code false}. - * - *
- * - * @param profile the ICC color profile. May not be {@code null}. - * @return {@code true} if known to be offending, {@code false} otherwise - * @throws IllegalArgumentException if {@code profile} is {@code null} - */ - static boolean isOffendingColorProfile(final ICC_Profile profile) { - Validate.notNull(profile, "profile"); - - // NOTE: - // Several embedded ICC color profiles are non-compliant with Java pre JDK7 and throws CMMException - // The problem with these embedded ICC profiles seems to be the rendering intent - // being 1 (01000000) - "Media Relative Colormetric" in the offending profiles, - // and 0 (00000000) - "Perceptual" in the good profiles - // (that is 1 single bit of difference right there.. ;-) - // See http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7064516 - - // This is particularly annoying, as the byte copying isn't really necessary, - // except the getRenderingIntent method is package protected in java.awt.color - byte[] header = profile.getData(ICC_Profile.icSigHead); - - return header[ICC_Profile.icHdrRenderingIntent] != 0 || header[ICC_Profile.icHdrRenderingIntent + 1] != 0 - || header[ICC_Profile.icHdrRenderingIntent + 2] != 0 || header[ICC_Profile.icHdrRenderingIntent + 3] > 3; - } - - /** - * Tests whether an ICC color profile is valid. - * Invalid profiles are known to cause problems for {@link java.awt.image.ColorConvertOp}. - *- * - * Note that this method only tests if a color conversion using this profile is known to fail. - * There's no guarantee that the color conversion will succeed even if this method returns {@code false}. - * - *
- * - * @param profile the ICC color profile. May not be {@code null}. - * @return {@code profile} if valid. - * @throws IllegalArgumentException if {@code profile} is {@code null} - * @throws java.awt.color.CMMException if {@code profile} is invalid. + * @deprecated Use {@link ColorProfiles#validateProfile(ICC_Profile)} instead. */ + @Deprecated public static ICC_Profile validateProfile(final ICC_Profile profile) { - // Fix profile before validation - profileCleaner.fixProfile(profile); - validateColorSpace(new ICC_ColorSpace(profile)); - - return profile; - } - - public static ICC_Profile readProfileRaw(final InputStream input) throws IOException { - return ICC_Profile.getInstance(input); - } - - public static ICC_Profile readProfile(final InputStream input) throws IOException { - // TODO: Implement this smarter? - // Could read the header 128 bytes, get size + magic, then read read rest into array and feed the byte[] method... - ICC_Profile profile = ICC_Profile.getInstance(input); - - if (profile == null) { - throw new IllegalArgumentException("Invalid ICC Profile Data"); - } - - return createProfile(profile.getData()); - } - - public static ICC_Profile createProfileRaw(final byte[] input) { - try { - return readProfileRaw(new ByteArrayInputStream(input)); - } - catch (IOException e) { - throw new IllegalArgumentException("Invalid ICC Profile Data", e); - } - } - - public static ICC_Profile createProfile(final byte[] input) { - Validate.notNull(input, "input"); - - if (input.length < ICC_PROFILE_HEADER_SIZE) { // Can't be less than size of ICC header - throw new IllegalArgumentException("Truncated ICC profile, length < 128: " + input.length); - } - int size = intBigEndian(input, 0); - if (size < 0 || size > input.length) { - throw new IllegalArgumentException("Truncated ICC profile, length < " + size + ": " + input.length); - } - - if (input[36] != 'a' || input[37] != 'c' || input[38] != 's' || input[39] != 'p') { - throw new IllegalArgumentException("Not an ICC profile, missing file signature"); - } - - // Look up in cache before returning, these are already validated - byte[] profileHeader = getProfileHeaderWithProfileId(input); - int csType = getCsType(profileHeader); - - ICC_ColorSpace internal = getInternalCS(csType, profileHeader); - if (internal != null) { - return internal.getProfile(); - } - - ICC_ColorSpace cached = getCachedCS(profileHeader); - if (cached != null) { - return cached.getProfile(); - } - - // WEIRDNESS: Unlike the InputStream version, the byte version - // of ICC_Profile.getInstance() does not discard extra bytes at the end. - // We'll chop them off here for convenience - byte[] profileBytes = input.length == size ? input : Arrays.copyOf(input, size); - ICC_Profile profile = ICC_Profile.getInstance(profileBytes); - - // We'll validate & cache by creating a color space and returning its profile... - // TODO: Rewrite with separate cache for profiles... - return createColorSpace(profile).getProfile(); - } - - private static int intBigEndian(byte[] data, int index) { - return (data[index] & 0xff) << 24 | (data[index + 1] & 0xff) << 16 | (data[index + 2] & 0xff) << 8 | (data[index + 3] & 0xff); - } - - private static int getCsType(byte[] profileHeader) { - int csSig = intBigEndian(profileHeader, ICC_Profile.icHdrColorSpace); - - // TODO: Wonder why they didn't just use the sig as type, when there is obviously a 1:1 mapping... - - switch (csSig) { - case ICC_Profile.icSigXYZData: - return ColorSpace.TYPE_XYZ; - case ICC_Profile.icSigLabData: - return ColorSpace.TYPE_Lab; - case ICC_Profile.icSigLuvData: - return ColorSpace.TYPE_Luv; - case ICC_Profile.icSigYCbCrData: - return ColorSpace.TYPE_YCbCr; - case ICC_Profile.icSigYxyData: - return ColorSpace.TYPE_Yxy; - case ICC_Profile.icSigRgbData: - return ColorSpace.TYPE_RGB; - case ICC_Profile.icSigGrayData: - return ColorSpace.TYPE_GRAY; - case ICC_Profile.icSigHsvData: - return ColorSpace.TYPE_HSV; - case ICC_Profile.icSigHlsData: - return ColorSpace.TYPE_HLS; - case ICC_Profile.icSigCmykData: - return ColorSpace.TYPE_CMYK; - // Note: There is no TYPE_* 10... - case ICC_Profile.icSigCmyData: - return ColorSpace.TYPE_CMY; - case ICC_Profile.icSigSpace2CLR: - return ColorSpace.TYPE_2CLR; - case ICC_Profile.icSigSpace3CLR: - return ColorSpace.TYPE_3CLR; - case ICC_Profile.icSigSpace4CLR: - return ColorSpace.TYPE_4CLR; - case ICC_Profile.icSigSpace5CLR: - return ColorSpace.TYPE_5CLR; - case ICC_Profile.icSigSpace6CLR: - return ColorSpace.TYPE_6CLR; - case ICC_Profile.icSigSpace7CLR: - return ColorSpace.TYPE_7CLR; - case ICC_Profile.icSigSpace8CLR: - return ColorSpace.TYPE_8CLR; - case ICC_Profile.icSigSpace9CLR: - return ColorSpace.TYPE_9CLR; - case ICC_Profile.icSigSpaceACLR: - return ColorSpace.TYPE_ACLR; - case ICC_Profile.icSigSpaceBCLR: - return ColorSpace.TYPE_BCLR; - case ICC_Profile.icSigSpaceCCLR: - return ColorSpace.TYPE_CCLR; - case ICC_Profile.icSigSpaceDCLR: - return ColorSpace.TYPE_DCLR; - case ICC_Profile.icSigSpaceECLR: - return ColorSpace.TYPE_ECLR; - case ICC_Profile.icSigSpaceFCLR: - return ColorSpace.TYPE_FCLR; - default: - throw new IllegalArgumentException("Invalid ICC color space signature: " + csSig); // TODO: fourCC? - } + return ColorProfiles.validateProfile(profile); } /** @@ -536,50 +297,6 @@ public final class ColorSpaces { } } - @SuppressWarnings("SameParameterValue") - private static ICC_Profile readProfileFromClasspathResource(final String profilePath) { - InputStream stream = ColorSpaces.class.getResourceAsStream(profilePath); - - if (stream != null) { - if (DEBUG) { - System.out.println("Loading profile from classpath resource: " + profilePath); - } - - try { - return ICC_Profile.getInstance(stream); - } - catch (IOException ignore) { - if (DEBUG) { - ignore.printStackTrace(); - } - } - finally { - FileUtil.close(stream); - } - } - - return null; - } - - private static ICC_Profile readProfileFromPath(final String profilePath) { - if (profilePath != null) { - if (DEBUG) { - System.out.println("Loading profile from: " + profilePath); - } - - try { - return ICC_Profile.getInstance(profilePath); - } - catch (SecurityException | IOException ignore) { - if (DEBUG) { - ignore.printStackTrace(); - } - } - } - - return null; - } - private static final class Key { private final byte[] data; @@ -602,78 +319,4 @@ public final class ColorSpaces { return getClass().getSimpleName() + "@" + Integer.toHexString(hashCode()); } } - - // Cache header profile data to avoid excessive array creation/copying. Use static inner class for on-demand lazy init - private static class sRGB { - private static final byte[] header = getProfileHeaderWithProfileId(ICC_Profile.getInstance(ColorSpace.CS_sRGB)); - } - - private static class CIEXYZ { - private static final byte[] header = getProfileHeaderWithProfileId(ICC_Profile.getInstance(ColorSpace.CS_CIEXYZ)); - } - - private static class PYCC { - private static final byte[] header = getProfileHeaderWithProfileId(ICC_Profile.getInstance(ColorSpace.CS_PYCC)); - } - - private static class GRAY { - private static final byte[] header = getProfileHeaderWithProfileId(ICC_Profile.getInstance(ColorSpace.CS_GRAY)); - } - - private static class LINEAR_RGB { - private static final byte[] header = getProfileHeaderWithProfileId(ICC_Profile.getInstance(ColorSpace.CS_LINEAR_RGB)); - } - - private static class Profiles { - // TODO: Honour java.iccprofile.path property? - private static final Properties PROFILES = loadProfiles(); - - private static Properties loadProfiles() { - Properties systemDefaults; - - try { - systemDefaults = SystemUtil.loadProperties( - ColorSpaces.class, - "com/twelvemonkeys/imageio/color/icc_profiles_" + Platform.os().id() - ); - } - catch (SecurityException | IOException ignore) { - System.err.printf( - "Warning: Could not load system default ICC profile locations from %s, will use bundled fallback profiles.\n", - ignore.getMessage() - ); - - if (DEBUG) { - ignore.printStackTrace(); - } - - systemDefaults = null; - } - - // Create map with defaults and add user overrides if any - Properties profiles = new Properties(systemDefaults); - - try { - Properties userOverrides = SystemUtil.loadProperties( - ColorSpaces.class, - "com/twelvemonkeys/imageio/color/icc_profiles" - ); - profiles.putAll(userOverrides); - } - catch (SecurityException | IOException ignore) { - // Most likely, this file won't be there - } - - if (DEBUG) { - System.out.println("User ICC profiles: " + profiles); - System.out.println("System ICC profiles : " + systemDefaults); - } - - return profiles; - } - - static String getPath(final String profileName) { - return PROFILES.getProperty(profileName); - } - } } diff --git a/imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/color/ProfileDeferralActivator.java b/imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/color/ProfileDeferralActivator.java index 1fcbce42..93a73045 100644 --- a/imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/color/ProfileDeferralActivator.java +++ b/imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/color/ProfileDeferralActivator.java @@ -1,3 +1,33 @@ +/* + * Copyright (c) 2021, Harald Kuhr + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * * Neither the name of the copyright holder nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + package com.twelvemonkeys.imageio.color; import javax.imageio.spi.ImageInputStreamSpi; diff --git a/imageio/imageio-core/src/main/resources/META-INF/services/javax.imageio.spi.ImageInputStreamSpi b/imageio/imageio-core/src/main/resources/META-INF/services/javax.imageio.spi.ImageInputStreamSpi index c31ffbaf..d00c2f2d 100644 --- a/imageio/imageio-core/src/main/resources/META-INF/services/javax.imageio.spi.ImageInputStreamSpi +++ b/imageio/imageio-core/src/main/resources/META-INF/services/javax.imageio.spi.ImageInputStreamSpi @@ -1,2 +1,4 @@ com.twelvemonkeys.imageio.stream.BufferedFileImageInputStreamSpi com.twelvemonkeys.imageio.stream.BufferedRAFImageInputStreamSpi +# Use SPI loading as a hook for early profile activation +com.twelvemonkeys.imageio.color.ProfileDeferralActivator$Spi diff --git a/imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/color/ColorProfilesTest.java b/imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/color/ColorProfilesTest.java new file mode 100644 index 00000000..173ae085 --- /dev/null +++ b/imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/color/ColorProfilesTest.java @@ -0,0 +1,245 @@ +package com.twelvemonkeys.imageio.color; + +import org.junit.Test; + +import java.awt.color.ColorSpace; +import java.awt.color.ICC_ColorSpace; +import java.awt.color.ICC_Profile; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.util.Arrays; + +import static org.junit.Assert.*; + +public class ColorProfilesTest { + @Test + public void testCreateColorSpaceFromBrokenProfileIsFixedCS_sRGB() { + ICC_Profile internal = ICC_Profile.getInstance(ColorSpace.CS_sRGB); + ICC_Profile profile = createBrokenProfile(internal); + assertNotSame(internal, profile); // Sanity check + + assertTrue(ColorProfiles.isOffendingColorProfile(profile)); + + ICC_ColorSpace created = ColorSpaces.createColorSpace(profile); + assertSame(ColorSpace.getInstance(ColorSpace.CS_sRGB), created); + assertTrue(created.isCS_sRGB()); + } + + private ICC_Profile createBrokenProfile(ICC_Profile internal) { + byte[] data = internal.getData(); + data[ICC_Profile.icHdrRenderingIntent] = 1; // Intent: 1 == Relative Colormetric Little Endian + data[ICC_Profile.icHdrRenderingIntent + 1] = 0; + data[ICC_Profile.icHdrRenderingIntent + 2] = 0; + data[ICC_Profile.icHdrRenderingIntent + 3] = 0; + return ICC_Profile.getInstance(data); + } + + @Test + public void testIsOffendingColorProfile() { + ICC_Profile broken = createBrokenProfile(ICC_Profile.getInstance(ColorSpace.CS_GRAY)); + assertTrue(ColorProfiles.isOffendingColorProfile(broken)); + } + + @Test + public void testIsCS_sRGBTrue() { + assertTrue(ColorProfiles.isCS_sRGB(ICC_Profile.getInstance(ColorSpace.CS_sRGB))); + } + + @Test + public void testIsCS_sRGBFalse() { + assertFalse(ColorProfiles.isCS_sRGB(ICC_Profile.getInstance(ColorSpace.CS_LINEAR_RGB))); + assertFalse(ColorProfiles.isCS_sRGB(ICC_Profile.getInstance(ColorSpace.CS_CIEXYZ))); + assertFalse(ColorProfiles.isCS_sRGB(ICC_Profile.getInstance(ColorSpace.CS_GRAY))); + assertFalse(ColorProfiles.isCS_sRGB(ICC_Profile.getInstance(ColorSpace.CS_PYCC))); + } + + @Test(expected = IllegalArgumentException.class) + public void testIsCS_sRGBNull() { + ColorProfiles.isCS_sRGB(null); + } + + @Test + public void testIsCS_GRAYTrue() { + assertTrue(ColorProfiles.isCS_GRAY(ICC_Profile.getInstance(ColorSpace.CS_GRAY))); + } + + @Test + public void testIsCS_GRAYFalse() { + assertFalse(ColorProfiles.isCS_GRAY(ICC_Profile.getInstance(ColorSpace.CS_sRGB))); + assertFalse(ColorProfiles.isCS_GRAY(ICC_Profile.getInstance(ColorSpace.CS_LINEAR_RGB))); + assertFalse(ColorProfiles.isCS_GRAY(ICC_Profile.getInstance(ColorSpace.CS_CIEXYZ))); + assertFalse(ColorProfiles.isCS_GRAY(ICC_Profile.getInstance(ColorSpace.CS_PYCC))); + } + + @Test(expected = IllegalArgumentException.class) + public void testIsCS_GRAYNull() { + ColorProfiles.isCS_GRAY(null); + } + + @Test(expected = IllegalArgumentException.class) + public void testCreateProfileNull() { + ColorProfiles.createProfile(null); + } + + @Test(expected = IllegalArgumentException.class) + public void testReadProfileNull() throws IOException { + ColorProfiles.readProfile(null); + } + + @Test(expected = IllegalArgumentException.class) + public void testCreateProfileRawNull() { + ColorProfiles.createProfileRaw(null); + } + + @Test(expected = IllegalArgumentException.class) + public void testReadProfileRawNull() throws IOException { + ColorProfiles.readProfileRaw(null); + } + + @Test + public void testCreateProfileRaw() throws IOException { + byte[] data = ICC_Profile.getInstance(getClass().getResourceAsStream("/profiles/adobe_rgb_1998.icc")).getData(); + ICC_Profile profileRaw = ColorProfiles.createProfileRaw(data); + assertArrayEquals(data, profileRaw.getData()); + } + + @Test + public void testReadProfileRaw() throws IOException { + byte[] data = ICC_Profile.getInstance(getClass().getResourceAsStream("/profiles/adobe_rgb_1998.icc")).getData(); + ICC_Profile profileRaw = ColorProfiles.readProfileRaw(getClass().getResourceAsStream("/profiles/adobe_rgb_1998.icc")); + assertArrayEquals(data, profileRaw.getData()); + } + + @Test(expected = IllegalArgumentException.class) + public void testCreateProfileRawBadData() { + ColorProfiles.createProfileRaw(new byte[5]); + } + + @Test(expected = IllegalArgumentException.class) + public void testReadProfileRawBadData() throws IOException { + ColorProfiles.readProfileRaw(new ByteArrayInputStream(new byte[5])); + } + + @Test(expected = IllegalArgumentException.class) + public void testCreateProfileBadData() { + ColorProfiles.createProfile(new byte[5]); + } + + @Test(expected = IllegalArgumentException.class) + public void testReadProfileBadData() throws IOException { + ColorProfiles.readProfile(new ByteArrayInputStream(new byte[5])); + } + + @Test(expected = IllegalArgumentException.class) + public void testCreateProfileRawTruncated() throws IOException { + byte[] data = ICC_Profile.getInstance(getClass().getResourceAsStream("/profiles/adobe_rgb_1998.icc")).getData(); + ColorProfiles.createProfileRaw(Arrays.copyOf(data, 200)); + } + + @Test(expected = IllegalArgumentException.class) + public void testReadProfileRawTruncated() throws IOException { + byte[] data = ICC_Profile.getInstance(getClass().getResourceAsStream("/profiles/adobe_rgb_1998.icc")).getData(); + ColorProfiles.readProfileRaw(new ByteArrayInputStream(data, 0, 200)); + } + + @Test(expected = IllegalArgumentException.class) + public void testCreateProfileTruncated() throws IOException { + byte[] data = ICC_Profile.getInstance(getClass().getResourceAsStream("/profiles/adobe_rgb_1998.icc")).getData(); + ColorProfiles.createProfile(Arrays.copyOf(data, 200)); + } + + @Test(expected = IllegalArgumentException.class) + public void testReadProfileTruncated() throws IOException { + byte[] data = ICC_Profile.getInstance(getClass().getResourceAsStream("/profiles/adobe_rgb_1998.icc")).getData(); + ColorProfiles.readProfile(new ByteArrayInputStream(data, 0, 200)); + } + + @Test(expected = IllegalArgumentException.class) + public void testCreateProfileRawTruncatedHeader() throws IOException { + byte[] data = ICC_Profile.getInstance(getClass().getResourceAsStream("/profiles/adobe_rgb_1998.icc")).getData(); + ColorProfiles.createProfileRaw(Arrays.copyOf(data, 125)); + } + + @Test(expected = IllegalArgumentException.class) + public void testReadProfileRawTruncatedHeader() throws IOException { + byte[] data = ICC_Profile.getInstance(getClass().getResourceAsStream("/profiles/adobe_rgb_1998.icc")).getData(); + ColorProfiles.readProfileRaw(new ByteArrayInputStream(data, 0, 125)); + } + + @Test(expected = IllegalArgumentException.class) + public void testCreateProfileTruncatedHeader() throws IOException { + byte[] data = ICC_Profile.getInstance(getClass().getResourceAsStream("/profiles/adobe_rgb_1998.icc")).getData(); + ColorProfiles.createProfile(Arrays.copyOf(data, 125)); + } + + @Test(expected = IllegalArgumentException.class) + public void testReadProfileTruncatedHeader() throws IOException { + byte[] data = ICC_Profile.getInstance(getClass().getResourceAsStream("/profiles/adobe_rgb_1998.icc")).getData(); + ColorProfiles.readProfile(new ByteArrayInputStream(data, 0, 125)); + } + + @Test + public void testCreateProfileBytesSame() throws IOException { + ICC_Profile profile = ICC_Profile.getInstance(getClass().getResourceAsStream("/profiles/adobe_rgb_1998.icc")); + ICC_Profile profile1 = ColorProfiles.createProfile(profile.getData()); + ICC_Profile profile2 = ColorProfiles.createProfile(profile.getData()); + + assertEquals(profile1, profile2); + assertSame(profile1, profile2); + } + + @Test + public void testReadProfileInputStreamSame() throws IOException { + ICC_Profile profile1 = ColorProfiles.readProfile(getClass().getResourceAsStream("/profiles/adobe_rgb_1998.icc")); + ICC_Profile profile2 = ColorProfiles.readProfile(getClass().getResourceAsStream("/profiles/adobe_rgb_1998.icc")); + + assertEquals(profile1, profile2); + assertSame(profile1, profile2); + } + + @Test + public void testReadProfileDifferent() throws IOException { + // These profiles are extracted from various JPEGs, and have the exact same profile header (but are different profiles)... + ICC_Profile profile1 = ColorProfiles.readProfile(getClass().getResourceAsStream("/profiles/adobe_rgb_1998.icc")); + ICC_Profile profile2 = ColorProfiles.readProfile(getClass().getResourceAsStream("/profiles/color_match_rgb.icc")); + + assertNotSame(profile1, profile2); + } + + @Test + public void testCreateProfileBytesSameAsCached() throws IOException { + ICC_Profile profile = ICC_Profile.getInstance(getClass().getResourceAsStream("/profiles/adobe_rgb_1998.icc")); + ICC_ColorSpace cs1 = ColorSpaces.createColorSpace(profile); + ICC_Profile profile2 = ColorProfiles.createProfile(profile.getData()); + + assertEquals(cs1.getProfile(), profile2); + assertSame(cs1.getProfile(), profile2); + } + + @Test + public void testReadProfileInputStreamSameAsCached() throws IOException { + ICC_ColorSpace cs1 = ColorSpaces.createColorSpace(ICC_Profile.getInstance(getClass().getResourceAsStream("/profiles/adobe_rgb_1998.icc"))); + ICC_Profile profile2 = ColorProfiles.readProfile(getClass().getResourceAsStream("/profiles/adobe_rgb_1998.icc")); + + assertEquals(cs1.getProfile(), profile2); + assertSame(cs1.getProfile(), profile2); + } + + @Test + public void testCreateProfileBytesSameAsInternal() { + ICC_Profile profile1 = ICC_Profile.getInstance(ColorSpace.CS_sRGB); + ICC_Profile profile2 = ColorProfiles.createProfile(ICC_Profile.getInstance(ColorSpace.CS_sRGB).getData()); + + assertEquals(profile1, profile2); + assertSame(profile1, profile2); + } + + @Test + public void testReadProfileInputStreamSameAsInternal() throws IOException { + ICC_Profile profile1 = ICC_Profile.getInstance(ColorSpace.CS_sRGB); + ICC_Profile profile2 = ColorProfiles.readProfile(new ByteArrayInputStream(ICC_Profile.getInstance(ColorSpace.CS_sRGB).getData())); + + assertEquals(profile1, profile2); + assertSame(profile1, profile2); + } +} \ No newline at end of file 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 20634554..a7da061b 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 @@ -35,7 +35,6 @@ import org.junit.Test; import java.awt.color.ColorSpace; import java.awt.color.ICC_ColorSpace; import java.awt.color.ICC_Profile; -import java.io.ByteArrayInputStream; import java.io.IOException; import static org.junit.Assert.*; @@ -91,34 +90,6 @@ public class ColorSpacesTest { assertTrue(created.isCS_sRGB()); } - @Test - public void testCreateColorSpaceFromBrokenProfileIsFixedCS_sRGB() { - ICC_Profile internal = ICC_Profile.getInstance(ColorSpace.CS_sRGB); - ICC_Profile profile = createBrokenProfile(internal); - assertNotSame(internal, profile); // Sanity check - - assertTrue(ColorSpaces.isOffendingColorProfile(profile)); - - ICC_ColorSpace created = ColorSpaces.createColorSpace(profile); - assertSame(ColorSpace.getInstance(ColorSpace.CS_sRGB), created); - assertTrue(created.isCS_sRGB()); - } - - private ICC_Profile createBrokenProfile(ICC_Profile internal) { - byte[] data = internal.getData(); - data[ICC_Profile.icHdrRenderingIntent] = 1; // Intent: 1 == Relative Colormetric Little Endian - data[ICC_Profile.icHdrRenderingIntent + 1] = 0; - data[ICC_Profile.icHdrRenderingIntent + 2] = 0; - data[ICC_Profile.icHdrRenderingIntent + 3] = 0; - return ICC_Profile.getInstance(data); - } - - @Test - public void testIsOffendingColorProfile() { - ICC_Profile broken = createBrokenProfile(ICC_Profile.getInstance(ColorSpace.CS_GRAY)); - assertTrue(ColorSpaces.isOffendingColorProfile(broken)); - } - @Test public void testCreateColorSpaceFromKnownProfileReturnsInternalCS_GRAY() { ICC_Profile profile = ICC_Profile.getInstance(ColorSpace.CS_GRAY); @@ -167,11 +138,13 @@ public class ColorSpacesTest { assertEquals(ColorSpace.TYPE_CMYK, ColorSpaces.getColorSpace(ColorSpaces.CS_GENERIC_CMYK).getType()); } + @SuppressWarnings("deprecation") @Test public void testIsCS_sRGBTrue() { assertTrue(ColorSpaces.isCS_sRGB(ICC_Profile.getInstance(ColorSpace.CS_sRGB))); } + @SuppressWarnings("deprecation") @Test public void testIsCS_sRGBFalse() { assertFalse(ColorSpaces.isCS_sRGB(ICC_Profile.getInstance(ColorSpace.CS_LINEAR_RGB))); @@ -180,16 +153,19 @@ public class ColorSpacesTest { assertFalse(ColorSpaces.isCS_sRGB(ICC_Profile.getInstance(ColorSpace.CS_PYCC))); } + @SuppressWarnings("deprecation") @Test(expected = IllegalArgumentException.class) public void testIsCS_sRGBNull() { ColorSpaces.isCS_sRGB(null); } + @SuppressWarnings("deprecation") @Test public void testIsCS_GRAYTrue() { assertTrue(ColorSpaces.isCS_GRAY(ICC_Profile.getInstance(ColorSpace.CS_GRAY))); } + @SuppressWarnings("deprecation") @Test public void testIsCS_GRAYFalse() { assertFalse(ColorSpaces.isCS_GRAY(ICC_Profile.getInstance(ColorSpace.CS_sRGB))); @@ -198,6 +174,7 @@ public class ColorSpacesTest { assertFalse(ColorSpaces.isCS_GRAY(ICC_Profile.getInstance(ColorSpace.CS_PYCC))); } + @SuppressWarnings("deprecation") @Test(expected = IllegalArgumentException.class) public void testIsCS_GRAYNull() { ColorSpaces.isCS_GRAY(null); @@ -216,69 +193,4 @@ public class ColorSpacesTest { assertNotSame(cs1, cs2); } - - @Test - public void testReadProfileBytesSame() throws IOException { - ICC_Profile profile = ICC_Profile.getInstance(getClass().getResourceAsStream("/profiles/adobe_rgb_1998.icc")); - ICC_Profile profile1 = ColorSpaces.createProfile(profile.getData()); - ICC_Profile profile2 = ColorSpaces.createProfile(profile.getData()); - - assertEquals(profile1, profile2); - assertSame(profile1, profile2); - } - - @Test - public void testReadProfileInputStreamSame() throws IOException { - ICC_Profile profile1 = ColorSpaces.readProfile(getClass().getResourceAsStream("/profiles/adobe_rgb_1998.icc")); - ICC_Profile profile2 = ColorSpaces.readProfile(getClass().getResourceAsStream("/profiles/adobe_rgb_1998.icc")); - - assertEquals(profile1, profile2); - assertSame(profile1, profile2); - } - - @Test - public void testReadProfileDifferent() throws IOException { - // These profiles are extracted from various JPEGs, and have the exact same profile header (but are different profiles)... - ICC_Profile profile1 = ColorSpaces.readProfile(getClass().getResourceAsStream("/profiles/adobe_rgb_1998.icc")); - ICC_Profile profile2 = ColorSpaces.readProfile(getClass().getResourceAsStream("/profiles/color_match_rgb.icc")); - - assertNotSame(profile1, profile2); - } - - @Test - public void testReadProfileBytesSameAsCached() throws IOException { - ICC_Profile profile = ICC_Profile.getInstance(getClass().getResourceAsStream("/profiles/adobe_rgb_1998.icc")); - ICC_ColorSpace cs1 = ColorSpaces.createColorSpace(profile); - ICC_Profile profile2 = ColorSpaces.createProfile(profile.getData()); - - assertEquals(cs1.getProfile(), profile2); - assertSame(cs1.getProfile(), profile2); - } - - @Test - public void testReadProfileInputStreamSameAsCached() throws IOException { - ICC_ColorSpace cs1 = ColorSpaces.createColorSpace(ICC_Profile.getInstance(getClass().getResourceAsStream("/profiles/adobe_rgb_1998.icc"))); - ICC_Profile profile2 = ColorSpaces.readProfile(getClass().getResourceAsStream("/profiles/adobe_rgb_1998.icc")); - - assertEquals(cs1.getProfile(), profile2); - assertSame(cs1.getProfile(), profile2); - } - - @Test - public void testReadProfileBytesSameAsInternal() { - ICC_Profile profile1 = ICC_Profile.getInstance(ColorSpace.CS_sRGB); - ICC_Profile profile2 = ColorSpaces.createProfile(ICC_Profile.getInstance(ColorSpace.CS_sRGB).getData()); - - assertEquals(profile1, profile2); - assertSame(profile1, profile2); - } - - @Test - public void testReadProfileInputStreamSameAsInternal() throws IOException { - ICC_Profile profile1 = ICC_Profile.getInstance(ColorSpace.CS_sRGB); - ICC_Profile profile2 = ColorSpaces.readProfile(new ByteArrayInputStream(ICC_Profile.getInstance(ColorSpace.CS_sRGB).getData())); - - assertEquals(profile1, profile2); - assertSame(profile1, profile2); - } } diff --git a/imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/color/ProfileDeferralActivatorTest.java b/imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/color/ProfileDeferralActivatorTest.java new file mode 100644 index 00000000..aedc4124 --- /dev/null +++ b/imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/color/ProfileDeferralActivatorTest.java @@ -0,0 +1,28 @@ +package com.twelvemonkeys.imageio.color; + +import org.junit.Test; + +import javax.imageio.spi.ImageInputStreamSpi; +import javax.imageio.spi.ServiceRegistry; + +import static org.mockito.Mockito.*; + +public class ProfileDeferralActivatorTest { + + @Test + public void testActivateProfiles() { + // Should just run with no exceptions... + ProfileDeferralActivator.activateProfiles(); + } + + @Test + public void testSpiRegistration() { + ProfileDeferralActivator.Spi spi = new ProfileDeferralActivator.Spi(); + ServiceRegistry registry = mock(ServiceRegistry.class); + Class