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

[ray at ghostscript.com]

Author: ray
Date: 2008-05-08 12:56:33 -0700 (Thu, 08 May 2008)
New Revision: 8717

Modified:
   trunk/gs/src/gp_unix.c
   trunk/gs/src/gximask.c
Log:
Fix gcc warnings, unused variables and type mismatch, implicit declaration.


Modified: trunk/gs/src/gp_unix.c
===================================================================
--- trunk/gs/src/gp_unix.c	2008-05-08 19:35:26 UTC (rev 8716)
+++ trunk/gs/src/gp_unix.c	2008-05-08 19:56:33 UTC (rev 8717)
@@ -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: trunk/gs/src/gximask.c
===================================================================
--- trunk/gs/src/gximask.c	2008-05-08 19:35:26 UTC (rev 8716)
+++ trunk/gs/src/gximask.c	2008-05-08 19:56:33 UTC (rev 8717)
@@ -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"