[gs-cvs] gs/src

[Ray Johnston]

Update of /cvs/ghostscript/gs/src
In directory casper2:/tmp/cvs-serv3937/src

Modified Files:
	genht.c gsiorom.c zdevice2.c zdps1.c zfcmap.c ztrans.c 
Log Message:
Fix (some of) the gcc compiler warnings (at least the really easy ones).


Index: genht.c
===================================================================
RCS file: /cvs/ghostscript/gs/src/genht.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- genht.c	21 Feb 2002 22:24:52 -0000	1.4
+++ genht.c	4 Oct 2005 06:30:02 -0000	1.5
@@ -105,7 +105,7 @@
     *pstr = str + 1;
     return true;
 }
-int
+private int
 parse_halftone(gx_device_halftone_resource_t *phtr, byte **pThresholds,
 	       char **pprefix, char **pcont)
 {
@@ -233,7 +233,7 @@
 }
 
 /* Write a halftone as a C procedure. */
-int
+private int
 write_halftone(FILE *out, gx_device_halftone_resource_t *phtr,
 	       const char *prefix, int index)
 {
@@ -269,9 +269,12 @@
 	    index, phtr->rname, phtr->HalftoneType, phtr->Width, phtr->Height,
 	    phtr->num_levels, index, index,
 	    ht_order_procs_short.bit_data_elt_size);
+
+    return 0;
 }
 
 /* Main program */
+int
 main(int argc, char *argv[])
 {
     char *iname;

Index: gsiorom.c
===================================================================
RCS file: /cvs/ghostscript/gs/src/gsiorom.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gsiorom.c	24 Aug 2005 19:02:22 -0000	1.1
+++ gsiorom.c	4 Oct 2005 06:30:02 -0000	1.2
@@ -72,6 +72,7 @@
 	return gs_error_VMerror;
 
     state->image = NULL;
+    return 0;
 }
 
 private int

Index: zdevice2.c
===================================================================
RCS file: /cvs/ghostscript/gs/src/zdevice2.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- zdevice2.c	4 Aug 2004 19:36:13 -0000	1.9
+++ zdevice2.c	4 Oct 2005 06:30:02 -0000	1.10
@@ -31,6 +31,9 @@
 #include "gxdevice.h"
 #include "gsstate.h"
 
+/* Exported for zfunc4.c */
+int z2copy(i_ctx_t *);
+
 /* Forward references */
 private int z2copy_gstate(i_ctx_t *);
 private int push_callout(i_ctx_t *, const char *);

Index: zdps1.c
===================================================================
RCS file: /cvs/ghostscript/gs/src/zdps1.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- zdps1.c	4 Aug 2004 19:36:13 -0000	1.7
+++ zdps1.c	4 Oct 2005 06:30:02 -0000	1.8
@@ -32,6 +32,9 @@
 /* Forward references */
 private int gstate_unshare(i_ctx_t *);
 
+/* Declare exported procedures (for zupath.c) */
+int zsetbbox(i_ctx_t *);
+
 /* Structure descriptors */
 public_st_igstate_obj();
 

Index: zfcmap.c
===================================================================
RCS file: /cvs/ghostscript/gs/src/zfcmap.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- zfcmap.c	20 Sep 2004 06:13:03 -0000	1.16
+++ zfcmap.c	4 Oct 2005 06:30:02 -0000	1.17
@@ -32,6 +32,10 @@
 #include "iname.h"
 #include "store.h"
 
+/* Exported for zfont0.c */
+int ztype0_get_cmap(const gs_cmap_t ** ppcmap, const ref * pfdepvector,
+		    const ref * op, gs_memory_t *imem);
+
 /*
  * Define whether to check the compatibility of CIDSystemInfo between the
  * CMap and the composite font.  PLRM2 says compatibility is required, but

Index: ztrans.c
===================================================================
RCS file: /cvs/ghostscript/gs/src/ztrans.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- ztrans.c	30 Aug 2005 17:32:13 -0000	1.27
+++ ztrans.c	4 Oct 2005 06:30:02 -0000	1.28
@@ -300,7 +300,7 @@
 zbegintransparencymaskimage(i_ctx_t *i_ctx_p)
 {
     gs_transparency_mask_params_t params;
-    gs_rect bbox = {0, 0, 1, 1};
+    gs_rect bbox = { { 0, 0} , { 1, 1} };
     int code;
 
     gs_trans_mask_params_init(&params, TRANSPARENCY_MASK_Luminosity);