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

[alexcher at ghostscript.com]

Author: alexcher
Date: 2007-04-17 17:23:49 -0700 (Tue, 17 Apr 2007)
New Revision: 7864

Modified:
   trunk/gs/src/gdevpbm.c
   trunk/gs/src/gdevpsdi.c
   trunk/gs/src/gspath1.c
   trunk/gs/src/gxttfb.c
   trunk/gs/src/ttinterp.c
   trunk/gs/src/zchar.c
Log:
Fix a few warnings generated by GCC 4.1.2.

DIFFERENCES:
None


Modified: trunk/gs/src/gdevpbm.c
===================================================================
--- trunk/gs/src/gdevpbm.c	2007-04-17 18:39:39 UTC (rev 7863)
+++ trunk/gs/src/gdevpbm.c	2007-04-18 00:23:49 UTC (rev 7864)
@@ -451,8 +451,9 @@
     const char *vname;
 
     if ((code = param_read_string_array(plist, "OutputIntent", &intent)) == 0) {
+#ifdef DEBUG
 	int i, j;
-#ifdef DEBUG
+
 	dlprintf1("%d strings:\n", intent.size);
 	for (i = 0; i < intent.size; i++) {
 	    const gs_param_string *s = &intent.data[i];

Modified: trunk/gs/src/gdevpsdi.c
===================================================================
--- trunk/gs/src/gdevpsdi.c	2007-04-17 18:39:39 UTC (rev 7863)
+++ trunk/gs/src/gdevpsdi.c	2007-04-18 00:23:49 UTC (rev 7864)
@@ -583,7 +583,6 @@
 	bool cmyk_to_rgb = psdf_is_converting_image_to_RGB(pdev, pis, pim);
 
 	if (cmyk_to_rgb) {
-	    extern_st(st_color_space);
 	    gs_memory_t *mem = pdev->v_memory;
 
 	    /* {csrc} decref old colorspace? */

Modified: trunk/gs/src/gspath1.c
===================================================================
--- trunk/gs/src/gspath1.c	2007-04-17 18:39:39 UTC (rev 7863)
+++ trunk/gs/src/gspath1.c	2007-04-18 00:23:49 UTC (rev 7864)
@@ -566,7 +566,9 @@
     if (path_last_is_moveto(pgs->path) && include_moveto) {
 	gs_fixed_point pt;
 
-	gx_path_current_point_inline(pgs->path, &pt);
+	code = gx_path_current_point_inline(pgs->path, &pt);
+        if (code < 0)
+	    return code;
 	if (pt.x < fbox.p.x)
 	    fbox.p.x = pt.x;
 	if (pt.y < fbox.p.y)

Modified: trunk/gs/src/gxttfb.c
===================================================================
--- trunk/gs/src/gxttfb.c	2007-04-17 18:39:39 UTC (rev 7863)
+++ trunk/gs/src/gxttfb.c	2007-04-18 00:23:49 UTC (rev 7864)
@@ -525,7 +525,8 @@
 path_to_hinter(t1_hinter *h, gx_path *path)
 {   int code;
     gs_path_enum penum;
-    gs_fixed_point pts[3], p;
+    gs_fixed_point pts[3];
+    gs_fixed_point p = {0, 0}; /* initialize to avoid a warning */
     bool first = true;
     int op;
 

Modified: trunk/gs/src/ttinterp.c
===================================================================
--- trunk/gs/src/ttinterp.c	2007-04-17 18:39:39 UTC (rev 7863)
+++ trunk/gs/src/ttinterp.c	2007-04-18 00:23:49 UTC (rev 7864)
@@ -87,9 +87,10 @@
 #  define DBG_PRINT4(fmt, a, b, c, d)
 #endif
 
+#ifdef DEBUG
 static int nInstrCount=0;
+#endif
 
-
 /* There are two kinds of implementations there:              */
 /*                                                            */
 /* a. static implementation:                                  */

Modified: trunk/gs/src/zchar.c
===================================================================
--- trunk/gs/src/zchar.c	2007-04-17 18:39:39 UTC (rev 7863)
+++ trunk/gs/src/zchar.c	2007-04-18 00:23:49 UTC (rev 7864)
@@ -478,7 +478,7 @@
     if (osenum == NULL && !(penum->text.operation & (TEXT_FROM_GLYPHS | TEXT_FROM_SINGLE_GLYPH))) {
         int ft = igs->root_font->FontType;
  
-        if (ft >= ft_CID_encrypted && ft <= ft_CID_TrueType || ft == ft_CID_bitmap)
+        if ((ft >= ft_CID_encrypted && ft <= ft_CID_TrueType) || ft == ft_CID_bitmap)
             return_error(e_typecheck);
     }
     make_mark_estack(ep - (snumpush - 1), es_show, op_show_cleanup);