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

[leonardo at ghostscript.com]

Author: leonardo
Date: 2006-10-23 04:17:11 -0700 (Mon, 23 Oct 2006)
New Revision: 7118

Modified:
   trunk/gs/src/gxccman.c
   trunk/gs/src/gxfcache.h
   trunk/gs/src/gxstroke.c
Log:
Fix : Repair the character cache logics with persistent cache entries (continued).

DETAILS :

Cygwin/gcc yielded unpleasant warnings.

EXPECTED DIFFERENCES :

None.


Modified: trunk/gs/src/gxccman.c
===================================================================
--- trunk/gs/src/gxccman.c	2006-10-22 18:58:27 UTC (rev 7117)
+++ trunk/gs/src/gxccman.c	2006-10-23 11:17:11 UTC (rev 7118)
@@ -465,7 +465,7 @@
 void
 gs_clean_fm_pair(gs_font_dir * dir, cached_fm_pair * pair)
 {
-    if_debug1('k', "[k]cleaning pair 0x%lx%s\n", (ulong) pair);
+    if_debug1('k', "[k]cleaning pair 0x%lx\n", (ulong) pair);
     pair->font = NULL;
     gs_clean_fm_pair_attributes(dir, pair);
 }

Modified: trunk/gs/src/gxfcache.h
===================================================================
--- trunk/gs/src/gxfcache.h	2006-10-22 18:58:27 UTC (rev 7117)
+++ trunk/gs/src/gxfcache.h	2006-10-23 11:17:11 UTC (rev 7118)
@@ -324,6 +324,10 @@
 	       gs_font *font, cached_fm_pair *pair,
 	       const gs_matrix * char_tm, const gs_log2_scale_point *log2_scale,
 	       bool design_grid);
+int  gx_provide_fm_pair_attributes(gs_font_dir * dir,
+	       gs_font *font, cached_fm_pair *pair,
+	       const gs_matrix * char_tm, const gs_log2_scale_point *log2_scale,
+	       bool design_grid);
 int  gx_touch_fm_pair(gs_font_dir *dir, cached_fm_pair *pair);
 void gx_lookup_xfont(const gs_state *, cached_fm_pair *, int);
 void gs_clean_fm_pair(gs_font_dir * dir, cached_fm_pair * pair);

Modified: trunk/gs/src/gxstroke.c
===================================================================
--- trunk/gs/src/gxstroke.c	2006-10-22 18:58:27 UTC (rev 7117)
+++ trunk/gs/src/gxstroke.c	2006-10-23 11:17:11 UTC (rev 7118)
@@ -893,7 +893,8 @@
     }
 }
 
-void adjust_stroke_longitude(pl_ptr plp, const gs_imager_state * pis, bool thin, bool horiz)
+private void 
+adjust_stroke_longitude(pl_ptr plp, const gs_imager_state * pis, bool thin, bool horiz)
 {
 
     fixed *pow = (horiz ? &plp->o.p.y : &plp->o.p.x);