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

[ray at ghostscript.com]

Author: ray
Date: 2006-10-06 09:54:37 -0700 (Fri, 06 Oct 2006)
New Revision: 7093

Modified:
   trunk/gs/lib/gs_devcs.ps
   trunk/gs/src/zcolor.c
Log:
Change to make color values be 'real' instead of sometimes 'integer' types
for PS CET 09-02 and MANY other pages.

DETAILS:

Since this is at the PS level, not the graphics lib, it shouldn't affect
PCL.

Note that 09-02 still shows a single instance of '0' instead of '0.0'.
I am continuing to track that down.

EXPECTED DIFFERENCES:

None. (with the regression test -- only the CET is affected).


Modified: trunk/gs/lib/gs_devcs.ps
===================================================================
--- trunk/gs/lib/gs_devcs.ps	2006-10-06 15:25:15 UTC (rev 7092)
+++ trunk/gs/lib/gs_devcs.ps	2006-10-06 16:54:37 UTC (rev 7093)
@@ -110,10 +110,10 @@
     /cs_potential_icc_alternate true
     /cs_get_ncomps //ncomps_1
     /cs_get_range  //get_range_1
-    /cs_get_default_color { pop 0 } bind
+    /cs_get_default_color { pop 0.0 } bind
     /cs_get_currentgray //pop_1
     /cs_get_currentrgb { pop dup dup } bind
-    /cs_get_currentcmyk { pop 1 exch sub 0 0 0 4 -1 roll } bind
+    /cs_get_currentcmyk { pop 1.0 exch sub 0.0 0.0 0.0 4 -1 roll } bind
     /cs_validate {}
 
     /cs_substitute
@@ -137,7 +137,7 @@
     /cs_potential_icc_alternate true
     /cs_get_ncomps //ncomps_3
     /cs_get_range  //get_range_3
-    /cs_get_default_color { pop 0 0 0 } bind
+    /cs_get_default_color { pop 0.0 0.0 0.0 } bind
     /cs_get_currentgray { pop //rgb_2_gray exec } bind
     /cs_get_currentrgb //pop_1
 
@@ -148,7 +148,7 @@
 
         % convert to subtractive (CMY) color space
         3
-          { 1 exch sub 3 1 roll }
+          { 1.0 exch sub 3 1 roll }
         repeat
 
         % find the minimum (initial k component)
@@ -210,17 +210,17 @@
     /cs_potential_icc_alternate true
     /cs_get_ncomps //ncomps_4
     /cs_get_range  //get_range_4
-    /cs_get_default_color { pop 0 0 0 1 } bind
+    /cs_get_default_color { pop 0.0 0.0 0.0 1.0 } bind
 
     /cs_get_currentgray
-      { pop 4 1 roll //rgb_2_gray exec add 1 exch sub //bound_0_1 exec }
+      { pop 4 1 roll //rgb_2_gray exec add 1.0 exch sub //bound_0_1 exec }
     bind
 
     /cs_get_currentrgb 
       {
         pop
         4 1 roll 3
-          { 3 index add  1 exch sub //bound_0_1 exec 3 1 roll }
+          { 3 index add  1.0 exch sub //bound_0_1 exec 3 1 roll }
         repeat
         4 -1 roll pop
       }

Modified: trunk/gs/src/zcolor.c
===================================================================
--- trunk/gs/src/zcolor.c	2006-10-06 15:25:15 UTC (rev 7092)
+++ trunk/gs/src/zcolor.c	2006-10-06 16:54:37 UTC (rev 7093)
@@ -100,7 +100,7 @@
         int     ival = (int)rval;
 
         /* the following handles indexed color spaces */
-        if (rval == ival)
+        if (rval == ival && pcs->type->index == gs_color_space_index_Indexed)
             make_int(op, ival);
         else
             make_real(op, rval);