[gs-cvs] rev 8700 - branches/mtrender/src

[ray at ghostscript.com]

Author: ray
Date: 2008-05-04 13:17:46 -0700 (Sun, 04 May 2008)
New Revision: 8700

Modified:
   branches/mtrender/src/gp_unix.c
   branches/mtrender/src/gstype42.c
   branches/mtrender/src/gxclist.c
   branches/mtrender/src/gxclrast.c
   branches/mtrender/src/gximask.c
   branches/mtrender/src/zchar42.c
Log:
Fix gcc warnings.


Modified: branches/mtrender/src/gp_unix.c
===================================================================
--- branches/mtrender/src/gp_unix.c	2008-05-04 19:59:11 UTC (rev 8699)
+++ branches/mtrender/src/gp_unix.c	2008-05-04 20:17:46 UTC (rev 8700)
@@ -341,9 +341,8 @@
 int gp_enumerate_fonts_next(void *enum_state, char **fontname, char **path)
 {
 #ifdef HAVE_FONTCONFIG
-    char* psname = NULL;
-
     unix_fontenum_t* state = (unix_fontenum_t *)enum_state;
+
     if (state == NULL) {
 	return 0;   /* gp_enumerate_fonts_init failed for some reason */
     }
@@ -393,8 +392,8 @@
     /* Gross hack to work around Fontconfig's inability to tell
      * us the font's PostScript name - generate it ourselves.
      * We must free the memory allocated here next time around. */
-    makePSFontName((char *)family_fc, weight_fc, slant_fc, &state->name, sizeof(state->name));
-    *fontname = &state->name;
+    makePSFontName((char *)family_fc, weight_fc, slant_fc, (char *)&state->name, sizeof(state->name));
+    *fontname = (char *)&state->name;
 
     /* return the font path straight out of fontconfig */
     *path = (char*)file_fc;

Modified: branches/mtrender/src/gstype42.c
===================================================================
--- branches/mtrender/src/gstype42.c	2008-05-04 19:59:11 UTC (rev 8699)
+++ branches/mtrender/src/gstype42.c	2008-05-04 20:17:46 UTC (rev 8700)
@@ -1298,7 +1298,6 @@
 
     if (!(info->members & FONT_INFO_EMBEDDING_RIGHTS) && (members & FONT_INFO_EMBEDDING_RIGHTS)) {
 	if(pfont->data.os2_offset != 0) {
-	    int (*string_proc)(gs_font_type42 *, ulong, uint, const byte **) = pfont->data.string_proc;
 	    unsigned char fstype[2];
 
 	    READ_SFNTS(pfont, pfont->data.os2_offset + 8, 2, fstype);

Modified: branches/mtrender/src/gxclist.c
===================================================================
--- branches/mtrender/src/gxclist.c	2008-05-04 19:59:11 UTC (rev 8699)
+++ branches/mtrender/src/gxclist.c	2008-05-04 20:17:46 UTC (rev 8700)
@@ -1010,7 +1010,6 @@
 {
     const gx_band_page_info_t *pinfo = &cdev->common.page_info;
     clist_file_ptr pfile = (!select ? pinfo->bfile : pinfo->cfile);
-    const char *fname = (!select ? pinfo->bfname : pinfo->cfname);
     int code;
 
     code = pinfo->io_procs->ftell(pfile);

Modified: branches/mtrender/src/gxclrast.c
===================================================================
--- branches/mtrender/src/gxclrast.c	2008-05-04 19:59:11 UTC (rev 8699)
+++ branches/mtrender/src/gxclrast.c	2008-05-04 20:17:46 UTC (rev 8700)
@@ -36,6 +36,7 @@
 #include "gxdhtres.h"
 #include "gxgetbit.h"
 #include "gxpaint.h"		/* for gx_fill/stroke_params */
+#include "gxpcolor.h"
 #include "gxhttile.h"
 #include "gxiparam.h"
 #include "gximask.h"
@@ -523,7 +524,6 @@
     gx_device_clip clipper_dev;
     bool clipper_dev_open;
     patch_fill_state_t pfs;
-    stream_state *st = s->state; /* Save because s_close resets s->state. */
     gs_composite_t *pcomp_first = NULL, *pcomp_last = NULL;
 
     cbuf.data = (byte *)cbuf_storage;
@@ -2169,7 +2169,6 @@
 
 	if (cleft < bytes && !pcb->end_status) {
 	    uint nread = cbuf_size - cleft;
-	    stream_state *st = pcb->s->state;
 
 #	    ifdef DEBUG
 	    {

Modified: branches/mtrender/src/gximask.c
===================================================================
--- branches/mtrender/src/gximask.c	2008-05-04 19:59:11 UTC (rev 8699)
+++ branches/mtrender/src/gximask.c	2008-05-04 20:17:46 UTC (rev 8700)
@@ -16,6 +16,7 @@
 #include "gx.h"
 #include "memory_.h"
 #include "gserrors.h"
+#include "gsptype1.h"
 #include "gsptype2.h"
 #include "gxdevice.h"
 #include "gxdcolor.h"

Modified: branches/mtrender/src/zchar42.c
===================================================================
--- branches/mtrender/src/zchar42.c	2008-05-04 19:59:11 UTC (rev 8699)
+++ branches/mtrender/src/zchar42.c	2008-05-04 20:17:46 UTC (rev 8700)
@@ -33,6 +33,7 @@
 #include "igstate.h"
 #include "iname.h"
 #include "store.h"
+#include "string_.h"
 #include "zchar42.h"
 
 /* Get a Type 42 character metrics and set the cache device. */