Silence some warnings, either by including new headers or by introducing

explicit casts.

No differences shown by local cluster testing (of pcl and gs only as xps is
currently broken).

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

8 files changed, 23 insertions, 13 deletions

diff --git a/gs/base/gdevpx.c b/gs/base/gdevpx.c
index 02a8f330c..29d49dce4 100644
--- a/gs/base/gdevpx.c
+++ b/gs/base/gdevpx.c
@@ -477,11 +477,11 @@ pclxl_flush_points(gx_device_pclxl * xdev)
 		    y_scale = max(((floatp) abs(xdev->points.data[i].y - temp_origin_y))/0x7FFF , y_scale);
 		}
 		for (i = 0; i < count; ++i) {
-		    xdev->points.data[i].x = (xdev->points.data[i].x - temp_origin_x)/x_scale + 0.5;
-		    xdev->points.data[i].y = (xdev->points.data[i].y - temp_origin_y)/y_scale + 0.5;
+		    xdev->points.data[i].x = (int)((xdev->points.data[i].x - temp_origin_x)/x_scale + 0.5);
+		    xdev->points.data[i].y = (int)((xdev->points.data[i].y - temp_origin_y)/y_scale + 0.5);
 		}
-		x = (x - temp_origin_x)/x_scale + 0.5;
-		y = (y - temp_origin_y)/y_scale + 0.5;
+		x = (int)((x - temp_origin_x)/x_scale + 0.5);
+		y = (int)((y - temp_origin_y)/y_scale + 0.5);
 		pclxl_set_page_scale(xdev, x_scale, y_scale);
 	    } else {
 		/* don't reset origin if we did not scale */
diff --git a/gs/base/gdevrinkj.c b/gs/base/gdevrinkj.c
index f21061950..2815d3007 100644
--- a/gs/base/gdevrinkj.c
+++ b/gs/base/gdevrinkj.c
@@ -1140,7 +1140,7 @@ rinkj_write_image_data(gx_device_printer *pdev, RinkjDevice *cmyk_dev)
 	    }
 	}
 
-	code = rinkj_device_write(cmyk_dev, split_plane_data);
+	code = rinkj_device_write(cmyk_dev, (const char **)split_plane_data);
     }
 
     rinkj_device_write(cmyk_dev, NULL);
diff --git a/gs/base/gsptype1.c b/gs/base/gsptype1.c
index 8c42e9d41..a9989b4fa 100644
--- a/gs/base/gsptype1.c
+++ b/gs/base/gsptype1.c
@@ -172,8 +172,8 @@ gs_pattern1_make_pattern(gs_client_color * pcc,
        if possible.  Note that any skew or rotation matrix will make it 
        neccessary to perform blending */
 
-    { int width = inst.template.BBox.q.x - inst.template.BBox.p.x;
-      int height = inst.template.BBox.q.y - inst.template.BBox.p.y;
+    { float width = inst.template.BBox.q.x - inst.template.BBox.p.x;
+      float height = inst.template.BBox.q.y - inst.template.BBox.p.y;
 
       if ( inst.template.XStep < width || inst.template.YStep < height || ctm_only(saved).xy != 0 || 
           ctm_only(saved).yx != 0 ){
diff --git a/gs/base/gstrans.c b/gs/base/gstrans.c
index d2f3c2bee..7d6581132 100644
--- a/gs/base/gstrans.c
+++ b/gs/base/gstrans.c
@@ -230,7 +230,8 @@ gs_begin_transparency_group(gs_state *pgs,
     const gs_color_space *blend_color_space;
     gs_imager_state * pis = (gs_imager_state *)pgs;
 
-    if (check_for_nontrans_pattern(pgs, "gs_begin_transparency_group")) {
+    if (check_for_nontrans_pattern(pgs,
+                  (unsigned char *)"gs_begin_transparency_group")) {
         return(0);
     }
     /*
@@ -390,7 +391,8 @@ gs_end_transparency_group(gs_state *pgs)
 {
     gs_pdf14trans_params_t params = { 0 };
 
-    if (check_for_nontrans_pattern(pgs, "gs_end_transparency_group")) {
+    if (check_for_nontrans_pattern(pgs,
+                  (unsigned char *)"gs_end_transparency_group")) {
         return(0);
     }
     if_debug0('v', "[v]gs_end_transparency_group\n");
@@ -418,7 +420,8 @@ gs_push_transparency_state(gs_state *pgs)
     gs_imager_state * pis = (gs_imager_state *)pgs;
     int code;
 
-    if (check_for_nontrans_pattern(pgs, "gs_push_transparency_state")) {
+    if (check_for_nontrans_pattern(pgs,
+                  (unsigned char *)"gs_push_transparency_state")) {
         return(0);
     }
     /* Set the pending flag to true, which indicates
@@ -466,7 +469,8 @@ gs_pop_transparency_state(gs_state *pgs)
     gs_imager_state * pis = (gs_imager_state *)pgs;
     int code;
 
-    if (check_for_nontrans_pattern(pgs, "gs_pop_transparency_state")) {
+    if (check_for_nontrans_pattern(pgs,
+                  (unsigned char *)"gs_pop_transparency_state")) {
         return(0);
     }
     /* Check if flag is set, which indicates that we have 
@@ -551,7 +555,8 @@ gs_begin_transparency_mask(gs_state * pgs,
     gs_imager_state * pis = (gs_imager_state *)pgs;
     int num_components;
 
-    if (check_for_nontrans_pattern(pgs, "gs_pop_transparency_state")) {
+    if (check_for_nontrans_pattern(pgs,
+                  (unsigned char *)"gs_pop_transparency_state")) {
         return(0);
     }
     params.pdf14_op = PDF14_BEGIN_TRANS_MASK;
@@ -720,7 +725,8 @@ gs_end_transparency_mask(gs_state *pgs,
     gs_pdf14trans_params_t params = { 0 };
     gs_imager_state * pis = (gs_imager_state *)pgs;
 
-    if (check_for_nontrans_pattern(pgs, "gs_end_transparency_mask")) {
+    if (check_for_nontrans_pattern(pgs,
+                  (unsigned char *)"gs_end_transparency_mask")) {
         return(0);
     }
     /* If we have done a q then set a flag to watch for any Qs */
diff --git a/gs/base/gxdcconv.c b/gs/base/gxdcconv.c
index d9aa060b1..ccf08d3a1 100644
--- a/gs/base/gxdcconv.c
+++ b/gs/base/gxdcconv.c
@@ -21,6 +21,7 @@
 #include "gxfarith.h"
 #include "gxlum.h"
 #include "gxistate.h"
+#include "gsstate.h"            /* for gs_currentcpsimode */
 
 /*
  * The CMYK to RGB algorithms specified by Adobe are, e.g.,
diff --git a/gs/base/gxfill.c b/gs/base/gxfill.c
index 07e100224..b494f12f4 100644
--- a/gs/base/gxfill.c
+++ b/gs/base/gxfill.c
@@ -50,6 +50,7 @@
 #include "memory_.h"
 #include "stdint_.h"
 #include "vdtrace.h"
+#include "gsstate.h"            /* for gs_currentcpsimode */
 /*
 #include "gxfilltr.h" - Do not remove this comment. "gxfilltr.h" is included below.
 #include "gxfillsl.h" - Do not remove this comment. "gxfillsl.h" is included below.
diff --git a/gs/base/gxstroke.c b/gs/base/gxstroke.c
index 62b63d0fa..ee50c393e 100644
--- a/gs/base/gxstroke.c
+++ b/gs/base/gxstroke.c
@@ -32,6 +32,7 @@
 #include "gzcpath.h"
 #include "gxpaint.h"
 #include "vdtrace.h"
+#include "gsstate.h"            /* for gs_currentcpsimode */
 
 /* RJW: There appears to be a difference in the xps and postscript models
  * (at least in as far as Microsofts implementation of xps and Acrobats of
diff --git a/gs/psi/zmisc.c b/gs/psi/zmisc.c
index 75c4baba4..806646551 100644
--- a/gs/psi/zmisc.c
+++ b/gs/psi/zmisc.c
@@ -28,6 +28,7 @@
 #include "ipacked.h"
 #include "ivmspace.h"
 #include "store.h"
+#include "igstate.h"            /* for gs_currentcpsimode */
 
 /**********************************************************************/