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

[leonardo at ghostscript.com]

Author: leonardo
Date: 2007-01-05 13:23:35 -0800 (Fri, 05 Jan 2007)
New Revision: 7568

Modified:
   trunk/gs/src/gdevpdti.c
   trunk/gs/src/gstext.h
   trunk/gs/src/gxfcopy.c
   trunk/gs/src/int.mak
   trunk/gs/src/ttfmain.c
   trunk/gs/src/zcharx.c
   trunk/gs/src/zimage.c
Log:
Fix : Cygwin/gcc warnings.


Modified: trunk/gs/src/gdevpdti.c
===================================================================
--- trunk/gs/src/gdevpdti.c	2007-01-05 20:44:21 UTC (rev 7567)
+++ trunk/gs/src/gdevpdti.c	2007-01-05 21:23:35 UTC (rev 7568)
@@ -713,7 +713,7 @@
     pdf_font_resource_t *pdfont = data->pdfont;
     pdf_char_proc_ownership_t *pcpo;
     pdf_font_cache_elem_t **e;
-    bool can_add_to_current_font, computed_can_add_to_current_font = false;
+    bool can_add_to_current_font = false, computed_can_add_to_current_font = false;
 
     /* Does it have same attributes ? */
     if (!pdf_is_same_charproc_attrs1(pdev, pcp0, pcp1))

Modified: trunk/gs/src/gstext.h
===================================================================
--- trunk/gs/src/gstext.h	2007-01-05 20:44:21 UTC (rev 7567)
+++ trunk/gs/src/gstext.h	2007-01-05 21:23:35 UTC (rev 7568)
@@ -325,4 +325,7 @@
 /* Release the text processing structures. */
 void gs_text_release(gs_text_enum_t *pte, client_name_t cname);
 
+/* Compute the number of characters in a text. */
+int gs_text_count_chars(gs_state * pgs, gs_text_params_t *text, gs_memory_t * mem);
+
 #endif /* gstext_INCLUDED */

Modified: trunk/gs/src/gxfcopy.c
===================================================================
--- trunk/gs/src/gxfcopy.c	2007-01-05 20:44:21 UTC (rev 7567)
+++ trunk/gs/src/gxfcopy.c	2007-01-05 21:23:35 UTC (rev 7568)
@@ -1234,18 +1234,19 @@
 
 private int
 copied_type42_get_metrics(gs_font_type42 * pfont, uint glyph_index,
-			  int wmode, float sbw[4])
+			  gs_type42_metrics_options_t options, float sbw[4])
 {
     /* Check whether we have metrics for this (glyph,wmode) pair. */
     gs_copied_font_data_t *const cfdata = pfont->data.proc_data;
     gs_copied_glyph_t *pcg;
+    int wmode = gs_type42_metrics_options_wmode(options);
 
     if (glyph_index >= cfdata->glyphs_size)
 	return_error(gs_error_rangecheck);
     pcg = &cfdata->glyphs[glyph_index];
     if (!(pcg->used & (HAS_SBW0 << wmode)))
 	return_error(gs_error_undefined);
-    return gs_type42_default_get_metrics(pfont, glyph_index, wmode, sbw);
+    return gs_type42_default_get_metrics(pfont, glyph_index, options, sbw);
 }
 
 private uint

Modified: trunk/gs/src/int.mak
===================================================================
--- trunk/gs/src/int.mak	2007-01-05 20:44:21 UTC (rev 7567)
+++ trunk/gs/src/int.mak	2007-01-05 21:23:35 UTC (rev 7568)
@@ -1439,7 +1439,7 @@
 
 $(PSOBJ)zcharx.$(OBJ) : $(PSSRC)zcharx.c $(OP)\
  $(gsmatrix_h) $(gstext_h) $(gxfixed_h) $(gxfont_h)\
- $(ialloc_h) $(ibnum_h) $(ichar_h) $(iname_h) $(igstate_h)
+ $(ialloc_h) $(ibnum_h) $(ichar_h) $(iname_h) $(igstate_h) $(memory__h)
 	$(PSCC) $(PSO_)zcharx.$(OBJ) $(C_) $(PSSRC)zcharx.c
 
 $(PSOBJ)zdps1.$(OBJ) : $(PSSRC)zdps1.c $(OP)\

Modified: trunk/gs/src/ttfmain.c
===================================================================
--- trunk/gs/src/ttfmain.c	2007-01-05 20:44:21 UTC (rev 7567)
+++ trunk/gs/src/ttfmain.c	2007-01-05 21:23:35 UTC (rev 7568)
@@ -477,7 +477,7 @@
     FontError error = fNoError;
     short arg1, arg2;
     short count;
-    unsigned int nMtxPos, nMtxGlyph = glyphIndex, nLongMetrics, i;
+    unsigned int i;
     unsigned short nAdvance;
     unsigned int nNextGlyphPtr = 0;
     unsigned int nPosBeg;

Modified: trunk/gs/src/zcharx.c
===================================================================
--- trunk/gs/src/zcharx.c	2007-01-05 20:44:21 UTC (rev 7567)
+++ trunk/gs/src/zcharx.c	2007-01-05 21:23:35 UTC (rev 7568)
@@ -24,6 +24,7 @@
 #include "igstate.h"
 #include "iname.h"
 #include "ibnum.h"
+#include "memory_.h"
 
 /* Common setup for glyphshow and .glyphwidth. */
 private int

Modified: trunk/gs/src/zimage.c
===================================================================
--- trunk/gs/src/zimage.c	2007-01-05 20:44:21 UTC (rev 7567)
+++ trunk/gs/src/zimage.c	2007-01-05 21:23:35 UTC (rev 7568)
@@ -315,7 +315,7 @@
     if ((penum = gs_image_enum_alloc(imemory_local, "image_setup")) == 0)
 	return_error(e_VMerror);
     code = gs_image_enum_init(penum, pie, (const gs_data_image_t *)pim, igs);
-    if (code != 0 || pie->skipping && string_sources) {		/* error, or empty image */
+    if (code != 0 || (pie->skipping && string_sources)) {		/* error, or empty image */
 	int code1 = gs_image_cleanup_and_free_enum(penum, igs);
 
 	if (code >= 0)		/* empty image */