[gs-commits] rev 10907 - branches/gs_2_colors/base

[robin at ghostscript.com]

Author: robin
Date: 2010-03-10 11:32:39 +0000 (Wed, 10 Mar 2010)
New Revision: 10907

Modified:
   branches/gs_2_colors/base/gxistate.h
   branches/gs_2_colors/base/gzstate.h
Log:
gs_2_colors: Move alternative cie_joint/pattern/dev_ht caches into
graphics_color_rendering state. Again this makes no difference now, but is
neater and should help in future.

No expected differences.



Modified: branches/gs_2_colors/base/gxistate.h
===================================================================
--- branches/gs_2_colors/base/gxistate.h	2010-03-10 06:13:23 UTC (rev 10906)
+++ branches/gs_2_colors/base/gxistate.h	2010-03-10 11:32:39 UTC (rev 10907)
@@ -162,7 +162,14 @@
 	/* Simple color spaces, stored here for easy access from */ 	\
 	/* gx_concrete_space_CIE */ \
 	gs_color_space *devicergb_cs;\
-	gs_color_space *devicecmyk_cs
+	gs_color_space *devicecmyk_cs;\
+\
+	/* Stores for cached values which correspond to whichever */\
+	/* color isn't in force at the moment */\
+	struct gx_cie_joint_caches_s *cie_joint_caches_alt;\
+	gs_devicen_color_map          color_component_map_alt;\
+	struct gx_pattern_cache_s    *pattern_cache_alt;\
+	gx_device_halftone           *dev_ht_alt
 
 /*
  * Enumerate the reference-counted pointers in a c.r. state.  Note that
@@ -176,7 +183,8 @@
   m(set_transfer.red) m(set_transfer.green)\
   m(set_transfer.blue) m(set_transfer.gray)\
   m(cie_joint_caches)\
-  m(devicergb_cs) m(devicecmyk_cs)
+  m(devicergb_cs) m(devicecmyk_cs)\
+  m(dev_ht_alt) m(cie_joint_caches)
 
 /* Enumerate the pointers in a c.r. state. */
 #define gs_cr_state_do_ptrs(m)\
@@ -185,7 +193,9 @@
   m(5,set_transfer.red) m(6,set_transfer.green)\
   m(7,set_transfer.blue) m(8,set_transfer.gray)\
   m(9,cie_joint_caches) m(10,pattern_cache)\
-  m(11,devicergb_cs) m(12,devicecmyk_cs)
+  m(11,devicergb_cs) m(12,devicecmyk_cs)\
+  m(13,cie_joint_caches_alt) m(14,pattern_cache_alt)\
+  m(15,dev_ht_alt)
   /*
    * We handle effective_transfer specially in gsistate.c since its pointers
    * are not enumerated for garbage collection but they are are relocated.
@@ -194,7 +204,7 @@
  * This count does not include the effective_transfer pointers since they
  * are not enumerated for GC.
  */
-#define st_cr_state_num_ptrs 13
+#define st_cr_state_num_ptrs 16
 
 
 typedef struct gs_devicen_color_map_s {

Modified: branches/gs_2_colors/base/gzstate.h
===================================================================
--- branches/gs_2_colors/base/gzstate.h	2010-03-10 06:13:23 UTC (rev 10906)
+++ branches/gs_2_colors/base/gzstate.h	2010-03-10 11:32:39 UTC (rev 10907)
@@ -118,13 +118,6 @@
         gx_device_color *dev_color;
     } color[2];
     
-    /* Stores for cached values which correspond to whichever of the
-     * above colors isn't in force at the moment */
-    struct gx_cie_joint_caches_s *cie_joint_caches_alt;
-    gx_device_halftone           *dev_ht_alt;
-    gs_devicen_color_map          color_component_map_alt;
-    struct gx_pattern_cache_s    *pattern_cache_alt;
-
     /* Font: */
 
     gs_font *font;
@@ -168,10 +161,8 @@
   m(6,color[0].color_space) m(7,color[0].ccolor) m(8,color[0].dev_color)\
   m(9,color[1].color_space) m(10,color[1].ccolor) m(11,color[1].dev_color)\
   m(12,font) m(13,root_font) m(14,show_gstate) /*m(---,device)*/\
-  m(15,transparency_group_stack)\
-  m(16,cie_joint_caches_alt) m(17,pattern_cache_alt)\
-  m(18,dev_ht_alt)
-#define gs_state_num_ptrs 19
+  m(15,transparency_group_stack)
+#define gs_state_num_ptrs 16
 
 /* The following macro is used for development purpose for designating places 
    where current point is changed. Clients must not use it. */