[gs-cvs] rev 8156 - in trunk/gs: lib src

[alexcher at ghostscript.com]

Author: alexcher
Date: 2007-07-31 07:19:45 -0700 (Tue, 31 Jul 2007)
New Revision: 8156

Modified:
   trunk/gs/lib/pdf_ops.ps
   trunk/gs/src/gsstate.c
   trunk/gs/src/gxistate.h
   trunk/gs/src/zcolor3.c
Log:
Use a correct name for the absolute colorimetric rendering intent. Change the
encoding of the rendering intents in the graphic state to use ICC numbers
from Table 18 (section 6.1.11) instead of the PDF order to reduce re-coding
and confusion. Bug 689377.

DIFFERENCES:
None


Modified: trunk/gs/lib/pdf_ops.ps
===================================================================
--- trunk/gs/lib/pdf_ops.ps	2007-07-31 03:31:13 UTC (rev 8155)
+++ trunk/gs/lib/pdf_ops.ps	2007-07-31 14:19:45 UTC (rev 8156)
@@ -26,10 +26,10 @@
  { userdict /pdfmark { cleartomark } bind put } if
 
 /renderingintentdict mark
-  /Absolute 0
+  /Perceptual 0
   /RelativeColorimetric 1
   /Saturation 2
-  /Perceptual 3
+  /AbsoluteColorimetric 3
 .dicttomark readonly def
 
 userdict /GS_PDF_ProcSet 127 dict dup begin

Modified: trunk/gs/src/gsstate.c
===================================================================
--- trunk/gs/src/gsstate.c	2007-07-31 03:31:13 UTC (rev 8155)
+++ trunk/gs/src/gsstate.c	2007-07-31 14:19:45 UTC (rev 8156)
@@ -699,7 +699,15 @@
     return pgs->overprint_mode;
 }
 
-/* setrenderingintent */
+/* setrenderingintent
+ *
+ *  Use ICC numbers from Table 18 (section 6.1.11) rather than the PDF order
+ *  to reduce re-coding and confusion.
+ *    Perceptual            0
+ *    Relative Colorimetric 1
+ *    Saturation            2
+ *    AbsoluteColorimetric  3
+ */
 int
 gs_setrenderingintent(gs_state *pgs, int ri) {
     if (ri < 0 || ri > 3)

Modified: trunk/gs/src/gxistate.h
===================================================================
--- trunk/gs/src/gxistate.h	2007-07-31 03:31:13 UTC (rev 8155)
+++ trunk/gs/src/gxistate.h	2007-07-31 14:19:45 UTC (rev 8156)
@@ -239,7 +239,7 @@
 	bool accurate_curves;\
 	bool have_pattern_streams;\
 	float smoothness;\
-	int renderingintent;\
+	int renderingintent; /* See gsstate.c */\
 	CUSTOM_COLOR_PTR	/* Pointer to custom color callback struct */\
 	const gx_color_map_procs *\
 	  (*get_cmap_procs)(const gs_imager_state *, const gx_device *);\

Modified: trunk/gs/src/zcolor3.c
===================================================================
--- trunk/gs/src/zcolor3.c	2007-07-31 03:31:13 UTC (rev 8155)
+++ trunk/gs/src/zcolor3.c	2007-07-31 14:19:45 UTC (rev 8156)
@@ -55,7 +55,9 @@
     return 0;
 }
 
-/* <int> .setrenderingintent - */
+/* <int> .setrenderingintent - 
+ * See the comment in gsstate.c about the argumet interepretation.
+ */
 private int
 zsetrenderingintent(i_ctx_t * i_ctx_p)
 {