[gs-cvs] rev 8174 - trunk/gs/lib

[alexcher at ghostscript.com]

Author: alexcher
Date: 2007-08-04 07:30:04 -0700 (Sat, 04 Aug 2007)
New Revision: 8174

Modified:
   trunk/gs/lib/gs_init.ps
   trunk/gs/lib/gs_lev2.ps
   trunk/gs/lib/pdf_ops.ps
Log:
Take rendering intent type from the /Intent key of the CRD created by Adobe
ProcSet "Adobe_AGM_Core 2.0 0" and pass it to the graphic state. Bug 689379

DIFFERENCES:
None


Modified: trunk/gs/lib/gs_init.ps
===================================================================
--- trunk/gs/lib/gs_init.ps	2007-08-03 16:29:44 UTC (rev 8173)
+++ trunk/gs/lib/gs_init.ps	2007-08-04 14:30:04 UTC (rev 8174)
@@ -1519,6 +1519,14 @@
   .setdefaultbgucr
 } bind def
 
+% Rendering intent mapping for setcolorrendering1 and PDF interpreter
+/.renderingintentdict mark
+  /Perceptual 0
+  /RelativeColorimetric 1
+  /Saturation 2
+  /AbsoluteColorimetric 3
+.dicttomark readonly def
+
 % Load basic color support
 %% Replace 1 (gs_cspace.ps)
 (gs_cspace.ps) runlibfile
@@ -2150,6 +2158,7 @@
 currentdict /.patterntypes .undef
 currentdict /.shadingtypes .undef
 currentdict /.wheredict .undef
+currentdict /.renderingintentdict .undef
 end
 
 % Clean up VM, and enable GC.

Modified: trunk/gs/lib/gs_lev2.ps
===================================================================
--- trunk/gs/lib/gs_lev2.ps	2007-08-03 16:29:44 UTC (rev 8173)
+++ trunk/gs/lib/gs_lev2.ps	2007-08-04 14:30:04 UTC (rev 8174)
@@ -770,6 +770,10 @@
 /.setcolorrendering1 where { pop } { (%END CRD) .skipeof } ifelse
 
 .colorrenderingtypes 1 {
+  % Adobe ProcSet "Adobe_AGM_Core 2.0 0" places an /Intent key into CRD's 
+  dup /Intent .knownget {
+    //.renderingintentdict exch .knownget { .setrenderingintent } if
+  } if
   dup .buildcolorrendering1 .setcolorrendering1
 } .bind put
 

Modified: trunk/gs/lib/pdf_ops.ps
===================================================================
--- trunk/gs/lib/pdf_ops.ps	2007-08-03 16:29:44 UTC (rev 8173)
+++ trunk/gs/lib/pdf_ops.ps	2007-08-04 14:30:04 UTC (rev 8174)
@@ -25,13 +25,6 @@
 systemdict /pdfmark known not
  { userdict /pdfmark { cleartomark } bind put } if
 
-/renderingintentdict mark
-  /Perceptual 0
-  /RelativeColorimetric 1
-  /Saturation 2
-  /AbsoluteColorimetric 3
-.dicttomark readonly def
-
 userdict /GS_PDF_ProcSet 127 dict dup begin
 
 % ---------------- Abbreviations ---------------- %
@@ -198,7 +191,7 @@
 /K { 4 array astore cvx //csdevcmyk scput } bdef
 /cs { csset fcput } bdef
 /CS { csset scput } bdef
-/ri { //renderingintentdict exch .knownget { .setrenderingintent } if } bdef
+/ri { //.renderingintentdict exch .knownget { .setrenderingintent } if } bdef
 % We have to break up sc according to the number of operands.
 /sc1 { /FillColor gput } bdef
 /SC1 { /StrokeColor gput } bdef