[gs-cvs] rev 7780 - trunk/gs/src

[alexcher at ghostscript.com]

Author: alexcher
Date: 2007-03-11 09:29:11 -0700 (Sun, 11 Mar 2007)
New Revision: 7780

Modified:
   trunk/gs/src/igstate.h
   trunk/gs/src/zgstate.c
Log:
Rename "ref dash_pattern" to avoid confusion with "float dash_pattern[]".


Modified: trunk/gs/src/igstate.h
===================================================================
--- trunk/gs/src/igstate.h	2007-03-11 13:46:54 UTC (rev 7779)
+++ trunk/gs/src/igstate.h	2007-03-11 16:29:11 UTC (rev 7780)
@@ -112,7 +112,7 @@
 #endif
 
 typedef struct int_gstate_s {
-    ref dash_pattern;		/* (array) */
+    ref dash_pattern_array;	/* (array) */
     /* Screen_procs are only relevant if setscreen was */
     /* executed more recently than sethalftone */
     /* (for this graphics context). */

Modified: trunk/gs/src/zgstate.c
===================================================================
--- trunk/gs/src/zgstate.c	2007-03-11 13:46:54 UTC (rev 7779)
+++ trunk/gs/src/zgstate.c	2007-03-11 16:29:11 UTC (rev 7780)
@@ -116,7 +116,7 @@
     iigs = gs_alloc_struct((gs_memory_t *)lmem, int_gstate, &st_int_gstate,
 			   "int_gstate_alloc(int_gstate)");
     int_gstate_map_refs(iigs, make_null);
-    make_empty_array(&iigs->dash_pattern, a_all);
+    make_empty_array(&iigs->dash_pattern_array, a_all);
     gs_alloc_ref_array(lmem, &proc0, a_readonly + a_executable, 2,
 		       "int_gstate_alloc(proc0)");
     make_oper(proc0.value.refs, 0, zpop);
@@ -316,7 +316,7 @@
     gs_free_object(mem, pattern, "setdash");	/* gs_setdash copies this */
     if (code < 0)
 	return code;
-    ref_assign(&istate->dash_pattern, op1);
+    ref_assign(&istate->dash_pattern_array, op1);
     pop(2);
     return code;
 }
@@ -328,7 +328,7 @@
     os_ptr op = osp;
 
     push(2);
-    ref_assign(op - 1, &istate->dash_pattern);
+    ref_assign(op - 1, &istate->dash_pattern_array);
     make_real(op, gs_currentdash_offset(igs));
     return 0;
 }