# HG changeset patch
# User prr
# Date 1209063493 25200
# Node ID 9e8d4d0c3d77dada1506bdb3d118d96f7f0af588
# Parent  f0e156a39c75441522f05bc7abc2675a37ea0b1c
6523403: Need to provide lcms library with PYCC and LINEAR_RGB OS ICC profiles
Summary: Add two contributed profiles and a fix to GRAY.pf, all from Redhat, keiths@redhat.com contributed the GRAY.pf fix.
Reviewed-by: jgodinez, avu, prr
Contributed-by: aph@redhat.com

diff -r f0e156a39c75 -r 9e8d4d0c3d77 jdk/make/sun/cmm/Makefile
--- a/jdk/make/sun/cmm/Makefile	Mon Apr 14 11:34:15 2008 -0700
+++ b/jdk/make/sun/cmm/Makefile	Thu Apr 24 11:58:13 2008 -0700
@@ -41,12 +41,8 @@
 ICCPROFILE_DEST_DIR = $(LIBDIR)/cmm
 
 iccprofiles: $(ICCPROFILE_DEST_DIR)/sRGB.pf $(ICCPROFILE_DEST_DIR)/GRAY.pf \
-	     $(ICCPROFILE_DEST_DIR)/CIEXYZ.pf
-
-ifndef OPENJDK
-iccprofiles:  $(ICCPROFILE_DEST_DIR)/PYCC.pf \
-	      $(ICCPROFILE_DEST_DIR)/LINEAR_RGB.pf
-endif
+	     $(ICCPROFILE_DEST_DIR)/CIEXYZ.pf $(ICCPROFILE_DEST_DIR)/PYCC.pf \
+	     $(ICCPROFILE_DEST_DIR)/LINEAR_RGB.pf
 
 $(ICCPROFILE_DEST_DIR)/sRGB.pf: $(ICCPROFILE_SRC_DIR)/sRGB.pf
 	$(RM) $(ICCPROFILE_DEST_DIR)/sRGB.pf
diff -r f0e156a39c75 -r 9e8d4d0c3d77 jdk/src/share/lib/cmm/lcms/GRAY.pf
Binary file jdk/src/share/lib/cmm/lcms/GRAY.pf has changed
diff -r f0e156a39c75 -r 9e8d4d0c3d77 jdk/src/share/lib/cmm/lcms/LINEAR_RGB.pf
Binary file jdk/src/share/lib/cmm/lcms/LINEAR_RGB.pf has changed
diff -r f0e156a39c75 -r 9e8d4d0c3d77 jdk/src/share/lib/cmm/lcms/PYCC.pf
Binary file jdk/src/share/lib/cmm/lcms/PYCC.pf has changed
diff -r f0e156a39c75 -r 9e8d4d0c3d77 jdk/test/sun/java2d/cmm/ProfileOp/ReadProfileTest.java
--- a/jdk/test/sun/java2d/cmm/ProfileOp/ReadProfileTest.java	Mon Apr 14 11:34:15 2008 -0700
+++ b/jdk/test/sun/java2d/cmm/ProfileOp/ReadProfileTest.java	Thu Apr 24 11:58:13 2008 -0700
@@ -23,7 +23,7 @@
 
 /**
  * @test
- * @bug 6476665
+ * @bug 6476665 6523403
  * @summary Verifies reading profiles of the standard color spaces
  * @run main ReadProfileTest
  */