Imported Upstream version 5.2.2

6 files changed, 29 insertions, 29 deletions

diff --git a/src/main/channel.c b/src/main/channel.c
index 278d8e2..b31a4f6 100644
--- a/src/main/channel.c
+++ b/src/main/channel.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: channel.c,v 1.30 2008/08/20 11:49:45 rlk Exp $"
+ * "$Id: channel.c,v 1.31 2008/10/29 00:10:42 easysw Exp $"
  *
  *   Dither routine entrypoints
  *
@@ -610,7 +610,7 @@ stp_channel_initialize(stp_vars_t *v, stp_image_t *image,
   stp_dprintf(STP_DBG_INK, v, "   input_channels %d\n", cg->input_channels);
   stp_dprintf(STP_DBG_INK, v, "   aux_channels   %d\n", cg->aux_output_channels);
   stp_dprintf(STP_DBG_INK, v, "   gcr_channels   %d\n", cg->gcr_channels);
-  stp_dprintf(STP_DBG_INK, v, "   width          %d\n", (int) cg->width);
+  stp_dprintf(STP_DBG_INK, v, "   width          %ld\n", (long)cg->width);
   stp_dprintf(STP_DBG_INK, v, "   ink_limit      %d\n", cg->ink_limit);
   stp_dprintf(STP_DBG_INK, v, "   gloss_limit    %d\n", cg->gloss_limit);
   stp_dprintf(STP_DBG_INK, v, "   max_density    %d\n", cg->max_density);
diff --git a/src/main/curve.c b/src/main/curve.c
index e65900b..d2ec824 100644
--- a/src/main/curve.c
+++ b/src/main/curve.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: curve.c,v 1.53 2008/01/21 23:19:39 rlk Exp $"
+ * "$Id: curve.c,v 1.54 2008/10/29 00:10:42 easysw Exp $"
  *
  *   Print plug-in driver utility functions for the GIMP.
  *
@@ -617,8 +617,8 @@ stp_curve_set_data(stp_curve_t *curve, size_t count, const double *data)
       {
 	stp_deprintf(STP_DBG_CURVE_ERRORS,
 		     "stp_curve_set_data: datum out of bounds: "
-		     "%g (require %g <= x <= %g), n = %d\n",
-		     data[i], low, high, i);
+		     "%g (require %g <= x <= %g), n = %ld\n",
+		     data[i], low, high, (long)i);
 	return 0;
       }
   /* Allocate sequence; also accounts for WRAP_MODE */
@@ -646,7 +646,7 @@ stp_curve_set_data_points(stp_curve_t *curve, size_t count,
   if (count < 2)
     {
       stp_deprintf(STP_DBG_CURVE_ERRORS,
-		   "stp_curve_set_data_points: too few points %d\n", count);
+		   "stp_curve_set_data_points: too few points %ld\n", (long)count);
       return 0;
     }
   if (curve->wrap_mode == STP_CURVE_WRAP_AROUND)
@@ -654,8 +654,8 @@ stp_curve_set_data_points(stp_curve_t *curve, size_t count,
   if (real_count > curve_point_limit)
     {
       stp_deprintf(STP_DBG_CURVE_ERRORS,
-		   "stp_curve_set_data_points: too many points %d\n",
-		   real_count);
+		   "stp_curve_set_data_points: too many points %ld\n",
+		   (long)real_count);
       return 0;
     }
 
@@ -667,8 +667,8 @@ stp_curve_set_data_points(stp_curve_t *curve, size_t count,
 	{
 	  stp_deprintf(STP_DBG_CURVE_ERRORS,
 		       "stp_curve_set_data_points: datum out of bounds: "
-		       "%g (require %g <= x <= %g), n = %d\n",
-		       data[i].y, low, high, i);
+		       "%g (require %g <= x <= %g), n = %ld\n",
+		       data[i].y, low, high, (long)i);
 	  return 0;
 	}
       if (i == 0 && data[i].x != 0.0)
@@ -696,16 +696,16 @@ stp_curve_set_data_points(stp_curve_t *curve, size_t count,
 	{
 	  stp_deprintf(STP_DBG_CURVE_ERRORS,
 		       "stp_curve_set_data_points: horizontal position out of bounds: "
-		       "%g, n = %d\n",
-		       data[i].x, i);
+		       "%g, n = %ld\n",
+		       data[i].x, (long)i);
 	  return 0;
 	}
       if (data[i].x - .000001 < last_x)
 	{
 	  stp_deprintf(STP_DBG_CURVE_ERRORS,
 		       "stp_curve_set_data_points: horizontal position must "
-		       "exceed previous position by .000001: %g, %g, n = %d\n",
-		       data[i].x, last_x, i);
+		       "exceed previous position by .000001: %g, %g, n = %ld\n",
+		       data[i].x, last_x, (long)i);
 	  return 0;
 	}
       last_x = data[i].x;
@@ -1218,8 +1218,8 @@ stp_curve_resample(stp_curve_t *curve, size_t points)
 	      return 0;
 	    }
 	  stp_deprintf(STP_DBG_CURVE,
-		       "Filling slots at %d %d: %f %f  %f %f  %d\n",
-		       i,curpos, high, low, high_y, low_y, limit);
+		       "Filling slots at %ld %d: %f %f  %f %f  %ld\n",
+		       (long)i,curpos, high, low, high_y, low_y, (long)limit);
 	  x_delta = high - low;
 	  high *= (limit - 1);
 	  low *= (limit - 1);
@@ -1560,8 +1560,8 @@ stp_curve_create_from_xmltree(stp_mxml_node_t *curve)  /* The curve node */
 	  if ((seq_count % 2) != 0)
 	    {
 	      stp_deprintf(STP_DBG_CURVE_ERRORS,
-			   "stp_curve_create_from_xmltree: invalid data count %d\n",
-			   seq_count);
+			   "stp_curve_create_from_xmltree: invalid data count %ld\n",
+			   (long)seq_count);
 	      goto error;
 	    }
 	  if (stp_curve_set_data_points(ret, seq_count / 2,
diff --git a/src/main/escp2-channels.c b/src/main/escp2-channels.c
index 99c2664..b899c78 100644
--- a/src/main/escp2-channels.c
+++ b/src/main/escp2-channels.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: escp2-channels.c,v 1.86 2008/07/06 15:50:56 rlk Exp $"
+ * "$Id: escp2-channels.c,v 1.87 2008/10/29 00:10:42 easysw Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -458,7 +458,7 @@ stpi_escp2_get_default_black_inkset(void)
 	  default_black_inkgroup->n_inklists < 1 ||
 	  default_black_inkgroup->inklists[0].n_inks < 1)
 	{
-	  stp_erprintf("Default black inkgroup: %x\n", (int) default_black_inkgroup);
+	  stp_erprintf("Default black inkgroup: %lx\n", (long) default_black_inkgroup);
 	  stp_erprintf("Unable to load default black ink definition!\n");
 	  stp_abort();
 	}
diff --git a/src/main/print-lexmark.c b/src/main/print-lexmark.c
index 1106fe7..e58828a 100644
--- a/src/main/print-lexmark.c
+++ b/src/main/print-lexmark.c
@@ -1,6 +1,6 @@
 
 /*
- * "$Id: print-lexmark.c,v 1.157 2008/07/24 00:15:33 rlk Exp $"
+ * "$Id: print-lexmark.c,v 1.158 2008/10/29 00:10:42 easysw Exp $"
  *
  *   Print plug-in Lexmark driver for the GIMP.
  *
@@ -980,7 +980,7 @@ lexmark_head_offset(int ydpi,                       /* i */
 {
   int i;
 
-  stp_deprintf(STP_DBG_LEXMARK, "  sizie %d,  size_v %d, size_v[0] %d\n", sizeof(*lineoff_buffer), sizeof(lineoff_buffer->v), sizeof(lineoff_buffer->v[0]));
+  stp_deprintf(STP_DBG_LEXMARK, "  sizie %d,  size_v %d, size_v[0] %d\n", (int)sizeof(*lineoff_buffer), (int)sizeof(lineoff_buffer->v), (int)sizeof(lineoff_buffer->v[0]));
   memcpy(lineoff_buffer, ink_parameter->head_offset, sizeof(*lineoff_buffer));
 
   for (i=0; i < (sizeof(lineoff_buffer->v) / sizeof(lineoff_buffer->v[0])); i++) {
diff --git a/src/main/print-weave.c b/src/main/print-weave.c
index d77e302..0207082 100644
--- a/src/main/print-weave.c
+++ b/src/main/print-weave.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-weave.c,v 1.71 2008/07/14 02:07:30 rlk Exp $"
+ * "$Id: print-weave.c,v 1.72 2008/10/29 00:10:42 easysw Exp $"
  *
  *   Softweave calculator for Gutenprint.
  *
@@ -1499,9 +1499,9 @@ add_to_row(stp_vars_t *v, stpi_softweave_t *sw, int row, unsigned char *buf,
   size_t count = linecount->v[color];
   if (place + nbytes > sw->virtual_jets * sw->bitwidth * sw->horizontal_width)
     {
-      stp_eprintf(v, "Buffer overflow: limit %d, actual %d, count %d\n",
+      stp_eprintf(v, "Buffer overflow: limit %d, actual %ld, count %ld\n",
 		  sw->virtual_jets * sw->bitwidth * sw->horizontal_width,
-		  place + nbytes, count);
+		  (long)(place + nbytes), (long)count);
       stp_abort();
     }
   memcpy(bufs->v[color] + lineoffs->v[color], buf, nbytes);
diff --git a/src/main/sequence.c b/src/main/sequence.c
index 3f7091c..bb3b7df 100644
--- a/src/main/sequence.c
+++ b/src/main/sequence.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: sequence.c,v 1.26 2008/06/15 16:23:39 rlk Exp $"
+ * "$Id: sequence.c,v 1.27 2008/10/29 00:10:42 easysw Exp $"
  *
  *   Sequence data type.  This type is designed to be derived from by
  *   the curve and dither matrix types.
@@ -383,8 +383,8 @@ stp_sequence_create_from_xmltree(stp_mxml_node_t *da)
     }
 
   stp_deprintf(STP_DBG_XML,
-	       "stp_sequence_create_from_xmltree: stp_sequence_set_size: %d\n",
-	       point_count);
+	       "stp_sequence_create_from_xmltree: stp_sequence_set_size: %ld\n",
+	       (long)point_count);
   stp_sequence_set_size(ret, point_count);
   stp_sequence_set_bounds(ret, low, high);
 
@@ -427,7 +427,7 @@ stp_sequence_create_from_xmltree(stp_mxml_node_t *da)
 	{
 	  stp_erprintf("stp_sequence_create_from_xmltree: "
 		       "read aborted: too little data "
-		       "(n=%d, needed %d)\n", i, point_count);
+		       "(n=%d, needed %ld)\n", i, (long)point_count);
 	  goto error;
 	}
     }