[gs-commits] ghostpdl branch, master, updated. ghostpdl-9.02-1020-ga2371ed

[Chris Liddell]

The ghostpdl branch, master has been updated
       via  a2371ed3ee29b5470dd892b78249d64d8f4466f4 (commit)
      from  d6f83dfa81a2073c3d1f67a30aee7e8407e4685a (commit)

----------------------------------------------------------------------
commit a2371ed3ee29b5470dd892b78249d64d8f4466f4
Author: Chris Liddell <chris.liddell at artifex.com>
Date:   Mon Mar 19 18:02:47 2012 +0000

    Clean up warnings.
    
    Clean up a couple of warnings I introduced in:
    f63237e1bb9a85124349ec0d0eae58737d7cb5ee
    
    No cluster differences expected.

diff --git a/gs/base/gxccache.c b/gs/base/gxccache.c
index 2cbc775..527599b 100644
--- a/gs/base/gxccache.c
+++ b/gs/base/gxccache.c
@@ -34,6 +34,7 @@
 #include "gscspace.h"		/* for gsimage.h */
 #include "gsimage.h"
 #include "gxhttile.h"
+#include "gsptype1.h"       /* for gx_dc_is_pattern1_color_with_trans */
 
 /* Forward references */
 static byte *compress_alpha_bits(const cached_char *, gs_memory_t *);
@@ -296,9 +297,8 @@ gx_image_cached_char(register gs_show_enum * penum, register cached_char * cc)
      */
     depth = (cc_depth(cc) == 3 ? 2 : cc_depth(cc));
     if ((dev_proc(orig_dev, fill_mask) != gx_default_fill_mask ||
-        !lop_no_S_is_T(pgs->log_op) &&
-        !gx_dc_is_pattern1_color_with_trans(pdevc))
-        ) {
+        !lop_no_S_is_T(pgs->log_op))) {
+
         gx_clip_path *pcpath;
 
         if (penum) {
diff --git a/gs/base/lib.mak b/gs/base/lib.mak
index 6b8791f..98db845 100644
--- a/gs/base/lib.mak
+++ b/gs/base/lib.mak
@@ -629,7 +629,8 @@ $(GLOBJ)gxccache.$(OBJ) : $(GLSRC)gxccache.c $(AK) $(gx_h)\
  $(gscencs_h) $(gxfixed_h) $(gxmatrix_h)\
  $(gzstate_h) $(gzpath_h) $(gxdevice_h) $(gxdevmem_h)\
  $(gzcpath_h) $(gxchar_h) $(gxfont_h) $(gxfcache_h)\
- $(gxxfont_h) $(gximask_h) $(gscspace_h) $(gsimage_h) $(gxhttile_h) $(MAKEDIRS)
+ $(gxxfont_h) $(gximask_h) $(gscspace_h) $(gsimage_h) $(gxhttile_h)\
+ $(gsptype1_h) $(MAKEDIRS)
 	$(GLCC) $(GLO_)gxccache.$(OBJ) $(C_) $(GLSRC)gxccache.c
 
 $(GLOBJ)gxccman.$(OBJ) : $(GLSRC)gxccman.c $(AK) $(gx_h) $(gserrors_h)\


Summary of changes:
 gs/base/gxccache.c |    6 +++---
 gs/base/lib.mak    |    3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)