Fix : MSVC, Cygwin/gcc warnings.

DETAILS :

Note 1:
This patch inserts 2 initializations into gswts.c against an indeterminzm,
but we don't case about correct values in those cases.

Note 2:
This patch removes the messing pointer type cast insetred with the last patch.

EXPECTED DIFFERENCES :

None.

git-svn-id: http://svn.ghostscript.com/ghostscript/trunk@6673 a1074d23-0009-0410-80fe-cf8c14f379e6

5 files changed, 11 insertions, 10 deletions

diff --git a/gs/src/gdevpdfg.c b/gs/src/gdevpdfg.c
index ceaf96340..ab3d7814e 100644
--- a/gs/src/gdevpdfg.c
+++ b/gs/src/gdevpdfg.c
@@ -281,7 +281,6 @@ is_pattern2_allowed_in_strategy(gx_device_pdf * pdev, const gx_drawing_color *pd
 {
     const gs_pattern2_instance_t *pinst =
 	    (gs_pattern2_instance_t *)pdc->ccolor.pattern;
-    const gs_shading_t *psh = pinst->template.Shading;
     const gs_color_space *pcs2 = gx_dc_pattern2_get_color_space(pdc);
     gs_color_space_index csi = gs_color_space_get_index(pcs2);
 
diff --git a/gs/src/gsimage.c b/gs/src/gsimage.c
index 32367d530..c9692e84b 100644
--- a/gs/src/gsimage.c
+++ b/gs/src/gsimage.c
@@ -281,7 +281,7 @@ begin_planes(gs_image_enum *penum)
     next_plane(penum);
 }
 
-int
+private int
 gs_image_common_init(gs_image_enum * penum, gx_image_enum_common_t * pie,
 	    const gs_data_image_t * pim, gx_device * dev)
 {
diff --git a/gs/src/gswts.c b/gs/src/gswts.c
index 6daccaea2..b33398377 100644
--- a/gs/src/gswts.c
+++ b/gs/src/gswts.c
@@ -1051,7 +1051,7 @@ wts_sort_cell(gs_wts_screen_enum_t *wse)
  * Return value: newly allocated bump.
  **/
 private bits32 *
-wts_blue_bump(gs_wts_screen_enum_t *wse)
+wts_blue_bump(const gs_wts_screen_enum_t *wse)
 {
     const gx_wts_cell_params_t *wcp;
     int width = wse->width;
@@ -1120,7 +1120,7 @@ wts_blue_bump(gs_wts_screen_enum_t *wse)
  * wts_sort_blue: Sort cell using BlueDot.
  **/
 static int
-wts_sort_blue(gs_wts_screen_enum_t *wse)
+wts_sort_blue(const gs_wts_screen_enum_t *wse)
 {
     bits32 *cell = wse->cell;
     int width = wse->width;
@@ -1303,7 +1303,7 @@ wts_screen_from_enum(const gs_wts_screen_enum_t *wse)
 {
     wts_screen_t *result = NULL;
     byte *key = NULL;
-    int key_size;
+    int key_size = 0; /* A stub. Was uninitialized when wse->t != WTS_SCREEN_J */
     int cell_off;
     int cell_len;
     byte *cell_result;
@@ -1329,7 +1329,7 @@ wts_screen_from_enum(const gs_wts_screen_enum_t *wse)
 	memcpy(wse->cell, cell_result, cell_len);
 	free(cell_result);
     } else {
-	wts_sort_blue((gs_wts_screen_enum_t *)wse);
+	wts_sort_blue(wse);
 	cell_len = wse->size * sizeof(bits32);
 	gp_cache_insert(GP_CACHE_TYPE_WTS_CELL, key, key_size,
 			(void *)wse->cell, cell_len);
@@ -1377,7 +1377,7 @@ gs_wts_free_screen(wts_screen_t * wts)
 int
 wts_size(const wts_screen_t *ws)
 {
-    int size;
+    int size = 0; /* A stub. Was uninitialized when none of 3 cases below. */
 
     if (ws->type == WTS_SCREEN_RAT) {
 	size = sizeof(wts_screen_t);
@@ -1392,7 +1392,7 @@ wts_size(const wts_screen_t *ws)
 wts_screen_t *
 gs_wts_from_buf(const byte *buf)
 {
-    wts_screen_t *ws = (wts_screen_t *)buf;
+    const wts_screen_t *ws = (const wts_screen_t *)buf;
     wts_screen_t *result;
     int size = wts_size(ws);
     int cell_size; /* size of cell in bytes */
@@ -1413,6 +1413,7 @@ gs_wts_from_buf(const byte *buf)
     return result;
 }
 
+#if 0 /* Never called. */
 /* Return value is size of buf in bytes */
 private int
 gs_wts_to_buf(const wts_screen_t *ws, byte **pbuf)
@@ -1431,6 +1432,7 @@ gs_wts_to_buf(const wts_screen_t *ws, byte **pbuf)
 
     return size + cell_size;
 }
+#endif
 
 #ifdef UNIT_TEST
 private int
diff --git a/gs/src/gxfcopy.c b/gs/src/gxfcopy.c
index 9ea10bcd3..eaf305d66 100644
--- a/gs/src/gxfcopy.c
+++ b/gs/src/gxfcopy.c
@@ -2353,6 +2353,7 @@ copied_drop_extension_glyphs(gs_font *copied)
     return 0;
 }
 
+private int
 compare_glyph_names(const void *pg1, const void *pg2)
 {
     const gs_copied_glyph_name_t * gn1 = *(const gs_copied_glyph_name_t **)pg1;
diff --git a/gs/src/gxwts.h b/gs/src/gxwts.h
index 29695ec21..4effbe2c9 100644
--- a/gs/src/gxwts.h
+++ b/gs/src/gxwts.h
@@ -68,8 +68,7 @@ typedef struct {
     int y1;
 } wts_screen_h_t;
 
-int
-wts_get_samples(const wts_screen_t *ws, int x, int y,
+int wts_get_samples(const wts_screen_t *ws, int x, int y,
 		wts_screen_sample_t **samples, int *p_nsamples);
 
 #endif