changeset 295:804b0757d801

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
author prr
date Thu, 24 Apr 2008 11:58:13 -0700
parents 90e1f09ce553
children ff8302a9936b
files make/sun/cmm/Makefile src/share/lib/cmm/lcms/GRAY.pf src/share/lib/cmm/lcms/LINEAR_RGB.pf src/share/lib/cmm/lcms/PYCC.pf test/sun/java2d/cmm/ProfileOp/ReadProfileTest.java
diffstat 5 files changed, 3 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/make/sun/cmm/Makefile	Mon Apr 14 11:34:15 2008 -0700
+++ b/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
Binary file src/share/lib/cmm/lcms/GRAY.pf has changed
Binary file src/share/lib/cmm/lcms/LINEAR_RGB.pf has changed
Binary file src/share/lib/cmm/lcms/PYCC.pf has changed
--- a/test/sun/java2d/cmm/ProfileOp/ReadProfileTest.java	Mon Apr 14 11:34:15 2008 -0700
+++ b/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
  */