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

[leonardo at ghostscript.com]

Author: leonardo
Date: 2006-11-02 11:42:47 -0800 (Thu, 02 Nov 2006)
New Revision: 7151

Modified:
   trunk/gs/src/gspcolor.h
   trunk/gs/src/gximask.c
   trunk/gs/src/lib.mak
Log:
Fix (imagemask) : An optimization for imagemask with a shading color, continued 2.

DETAILS :

Cygwin/gcc warnings in the last patch.

EXPECTED DIFFERENCES :

None.


Modified: trunk/gs/src/gspcolor.h
===================================================================
--- trunk/gs/src/gspcolor.h	2006-11-02 19:19:23 UTC (rev 7150)
+++ trunk/gs/src/gspcolor.h	2006-11-02 19:42:47 UTC (rev 7151)
@@ -48,6 +48,10 @@
 #  define gs_pattern_type_DEFINED
 typedef struct gs_pattern_type_s gs_pattern_type_t;
 #endif
+#ifndef gs_matrix_DEFINED
+#  define gs_matrix_DEFINED
+typedef struct gs_matrix_s gs_matrix;
+#endif
 
 #define gs_pattern_template_common\
   const gs_pattern_type_t *type;\

Modified: trunk/gs/src/gximask.c
===================================================================
--- trunk/gs/src/gximask.c	2006-11-02 19:19:23 UTC (rev 7150)
+++ trunk/gs/src/gximask.c	2006-11-02 19:42:47 UTC (rev 7151)
@@ -16,9 +16,11 @@
 #include "gx.h"
 #include "memory_.h"
 #include "gserrors.h"
+#include "gsptype2.h"
 #include "gxdevice.h"
 #include "gxdcolor.h"
 #include "gxcpath.h"
+#include "gximask.h"
 #include "gzacpath.h"
 #include "gzcpath.h"
 

Modified: trunk/gs/src/lib.mak
===================================================================
--- trunk/gs/src/lib.mak	2006-11-02 19:19:23 UTC (rev 7150)
+++ trunk/gs/src/lib.mak	2006-11-02 19:42:47 UTC (rev 7151)
@@ -664,9 +664,9 @@
 	$(GLCC) $(GLO_)gximono.$(OBJ) $(C_) $(GLSRC)gximono.c
 
 $(GLOBJ)gximask.$(OBJ) : $(GLSRC)gximask.c $(GXERR) $(memory__h) $(gserrors_h)\
- $(gxdevice_h) $(gxdcolor_h) $(gxcpath_h) $(gzacpath_h)\
- $(gzcpath_h) 
- 	$(GLCC) $(GLO_)gximask.$(OBJ) $(C_) $(GLSRC)gximask.c
+ $(gsptype2_h) $(gxdevice_h) $(gxdcolor_h) $(gxcpath_h) $(gximask_h) $(gzacpath_h)\
+ $(gzcpath_h)
+	$(GLCC) $(GLO_)gximask.$(OBJ) $(C_) $(GLSRC)gximask.c
 
 $(GLOBJ)gxipixel.$(OBJ) : $(GLSRC)gxipixel.c $(GXERR) $(math__h) $(memory__h)\
  $(gpcheck_h)\