Add -Wsign-compare compiler flag and fix all warnings

20 files changed, 49 insertions, 50 deletions

diff --git a/configure.in b/configure.in
index 80cdd41c6..cb2fa23c8 100644
--- a/configure.in
+++ b/configure.in
@@ -533,7 +533,7 @@ dnl Use lots of warning flags with GCC
 WARN_CFLAGS=""
 
 if test "x$GCC" = "xyes"; then
-	WARN_CFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes \
+	WARN_CFLAGS="-Wall -Wsign-compare -Wpointer-arith -Wstrict-prototypes \
 	-Wmissing-prototypes -Wmissing-declarations \
 	-Wnested-externs -fno-strict-aliasing -Wold-style-definition"
 fi
diff --git a/pixman/src/fbpict.c b/pixman/src/fbpict.c
index 6f454c631..0d547d9fd 100644
--- a/pixman/src/fbpict.c
+++ b/pixman/src/fbpict.c
@@ -1349,7 +1349,7 @@ pixman_composite (pixman_operator_t	op,
     Bool	    maskAlphaMap = FALSE;
     Bool	    dstAlphaMap = pDst->alphaMap != 0;
     int		    x_msk, y_msk, x_src, y_src, x_dst, y_dst;
-    int		    w, h, w_this, h_this;
+    unsigned int    w, h, w_this, h_this;
 
 #ifdef USE_MMX
     static Bool mmx_setup = FALSE;
diff --git a/pixman/src/icformat.c b/pixman/src/icformat.c
index 62a171da8..946c9fe54 100644
--- a/pixman/src/icformat.c
+++ b/pixman/src/icformat.c
@@ -23,7 +23,7 @@
 
 #include "icint.h"
 
-#define Mask(n)	((n) == 32 ? 0xffffffff : ((1 << (n))-1))
+#define Mask(n)	((n) == 32 ? 0xffffffff : (unsigned) ((1 << (n))-1))
 
 pixman_format_t *
 pixman_format_create (pixman_format_name_t name)
@@ -169,11 +169,11 @@ pixman_format_destroy (pixman_format_t *format)
 
 void
 pixman_format_get_masks (pixman_format_t *format,
-                         int *bpp,
-                         int *alpha_mask,
-                         int *red_mask,
-                         int *green_mask,
-                         int *blue_mask)
+                         unsigned int *bpp,
+                         unsigned int *alpha_mask,
+                         unsigned int *red_mask,
+                         unsigned int *green_mask,
+                         unsigned int *blue_mask)
 {
     *bpp = PICT_FORMAT_BPP (format->format_code);
 
diff --git a/pixman/src/pixman.h b/pixman/src/pixman.h
index ca24e338e..173394d2d 100644
--- a/pixman/src/pixman.h
+++ b/pixman/src/pixman.h
@@ -247,11 +247,11 @@ pixman_format_destroy (pixman_format_t *format);
 
 void
 pixman_format_get_masks (pixman_format_t *format,
-                         int *bpp,
-                         int *alpha_mask,
-                         int *red_mask,
-                         int *green_mask,
-                         int *blue_mask);
+                         unsigned int *bpp,
+                         unsigned int *alpha_mask,
+                         unsigned int *red_mask,
+                         unsigned int *green_mask,
+                         unsigned int *blue_mask);
 
 /* icimage.c */
 
diff --git a/src/cairo-array.c b/src/cairo-array.c
index baf17659a..218f51115 100644
--- a/src/cairo-array.c
+++ b/src/cairo-array.c
@@ -159,7 +159,7 @@ _cairo_array_grow_by (cairo_array_t *array, int additional)
  * beyond @num_elements are simply "forgotten".
  **/
 void
-_cairo_array_truncate (cairo_array_t *array, int num_elements)
+_cairo_array_truncate (cairo_array_t *array, unsigned int num_elements)
 {
     assert (! array->is_snapshot);
 
@@ -187,7 +187,7 @@ _cairo_array_truncate (cairo_array_t *array, int num_elements)
  *	    ... use values[i] here ...
  **/
 void *
-_cairo_array_index (cairo_array_t *array, int index)
+_cairo_array_index (cairo_array_t *array, unsigned int index)
 {
     /* We allow an index of 0 for the no-elements case.
      * This makes for cleaner calling code which will often look like:
@@ -287,7 +287,7 @@ _cairo_array_append_multiple (cairo_array_t	*array,
  **/
 cairo_status_t
 _cairo_array_allocate (cairo_array_t	 *array,
-		       int		  num_elements,
+		       unsigned int	  num_elements,
 		       void		**elements)
 {
     cairo_status_t status;
diff --git a/src/cairo-font-subset.c b/src/cairo-font-subset.c
index dc21d1490..7e9472366 100644
--- a/src/cairo-font-subset.c
+++ b/src/cairo-font-subset.c
@@ -686,7 +686,7 @@ cairo_pdf_ft_font_generate (void *abstract_font,
     cairo_ft_unscaled_font_t *ft_unscaled_font;
     cairo_pdf_ft_font_t *font = abstract_font;
     unsigned long start, end, next, checksum, *checksum_location;
-    int i;
+    unsigned int i;
 
     /* XXX: It would be cleaner to do something besides this cast
      * here. Perhaps cairo_pdf_ft_font_t should just have the
diff --git a/src/cairo-gstate.c b/src/cairo-gstate.c
index f6bd6013a..1196691bf 100644
--- a/src/cairo-gstate.c
+++ b/src/cairo-gstate.c
@@ -494,7 +494,7 @@ _cairo_gstate_get_line_join (cairo_gstate_t *gstate)
 cairo_status_t
 _cairo_gstate_set_dash (cairo_gstate_t *gstate, const double *dash, int num_dashes, double offset)
 {
-    int i;
+    unsigned int i;
     double dash_total;
 
     if (gstate->stroke_style.dash)
diff --git a/src/cairo-hash.c b/src/cairo-hash.c
index a9909a264..948cd232f 100644
--- a/src/cairo-hash.c
+++ b/src/cairo-hash.c
@@ -115,7 +115,7 @@ static const cairo_hash_table_arrangement_t hash_table_arrangements [] = {
     { 268435456,	590559793,	590559791	}
 };
 
-#define NUM_HASH_TABLE_ARRANGEMENTS (sizeof(hash_table_arrangements)/sizeof(hash_table_arrangements[0]))
+#define NUM_HASH_TABLE_ARRANGEMENTS ((int)(sizeof(hash_table_arrangements)/sizeof(hash_table_arrangements[0])))
 
 struct _cairo_hash_table {
     cairo_hash_keys_equal_func_t keys_equal;
diff --git a/src/cairo-image-surface.c b/src/cairo-image-surface.c
index 4a8f52b19..8aca7bce1 100644
--- a/src/cairo-image-surface.c
+++ b/src/cairo-image-surface.c
@@ -90,7 +90,7 @@ _cairo_image_surface_create_for_pixman_image (pixman_image_t *pixman_image,
 static cairo_format_t
 _cairo_format_from_pixman_format (pixman_format_t *pixman_format)
 {
-    int bpp, am, rm, gm, bm;
+    unsigned int bpp, am, rm, gm, bm;
 
     pixman_format_get_masks (pixman_format, &bpp, &am, &rm, &gm, &bm);
 
diff --git a/src/cairo-output-stream.c b/src/cairo-output-stream.c
index 96ff8ce0c..351c6a4d9 100644
--- a/src/cairo-output-stream.c
+++ b/src/cairo-output-stream.c
@@ -184,7 +184,7 @@ _cairo_output_stream_write_hex_string (cairo_output_stream_t *stream,
 {
     const char hex_chars[] = "0123456789abcdef";
     char buffer[2];
-    int i, column;
+    unsigned int i, column;
 
     if (stream->status)
 	return;
diff --git a/src/cairo-path-stroke.c b/src/cairo-path-stroke.c
index 4ba321ef2..051d06899 100644
--- a/src/cairo-path-stroke.c
+++ b/src/cairo-path-stroke.c
@@ -59,7 +59,7 @@ typedef struct cairo_stroker {
     cairo_stroke_face_t first_face;
 
     cairo_bool_t dashed;
-    int dash_index;
+    unsigned int dash_index;
     int dash_on;
     double dash_remain;
 } cairo_stroker_t;
@@ -114,7 +114,7 @@ _cairo_stroker_start_dash (cairo_stroker_t *stroker)
 {
     double offset;
     int	on = 1;
-    int	i = 0;
+    unsigned int i = 0;
 
     offset = stroker->style->dash_offset;
 
diff --git a/src/cairo-pattern.c b/src/cairo-pattern.c
index 269a3e324..463c0e816 100644
--- a/src/cairo-pattern.c
+++ b/src/cairo-pattern.c
@@ -591,7 +591,7 @@ _cairo_pattern_add_color_stop (cairo_gradient_pattern_t *pattern,
 {
     pixman_gradient_stop_t *new_stops;
     cairo_fixed_t	   x;
-    int			   i;
+    unsigned int	   i;
 
     new_stops = realloc (pattern->stops, (pattern->n_stops + 1) *
 			 sizeof (pixman_gradient_stop_t));
@@ -1079,7 +1079,7 @@ _cairo_pattern_is_opaque_solid (const cairo_pattern_t *pattern)
 static cairo_bool_t
 _gradient_is_opaque (const cairo_gradient_pattern_t *gradient)
 {
-    int i;
+    unsigned int i;
 
     for (i = 0; i < gradient->n_stops; i++)
 	if (! CAIRO_ALPHA_IS_OPAQUE (gradient->stops[i].color.alpha))
diff --git a/src/cairo-pdf-surface.c b/src/cairo-pdf-surface.c
index aaf71c7ec..ea436e6e0 100644
--- a/src/cairo-pdf-surface.c
+++ b/src/cairo-pdf-surface.c
@@ -1081,8 +1081,7 @@ emit_pattern_stops (cairo_pdf_surface_t *surface, cairo_gradient_pattern_t *patt
 {
     cairo_pdf_resource_t    function;
     cairo_pdf_color_stop_t *allstops, *stops;
-    unsigned int 	   n_stops;
-    unsigned int 	   i;
+    unsigned int i, n_stops;
 
     function = _cairo_pdf_surface_new_object (surface);
 
@@ -2451,7 +2450,7 @@ _cairo_pdf_surface_emit_stroke_style (cairo_pdf_surface_t	*surface,
 				 _cairo_pdf_line_join (style->line_join));
 
     if (style->num_dashes) {
-	int d;
+	unsigned int d;
 	_cairo_output_stream_printf (surface->output, "[");
 	for (d = 0; d < style->num_dashes; d++)
 	    _cairo_output_stream_printf (surface->output, " %f", style->dash[d]);
@@ -2579,7 +2578,7 @@ _cairo_pdf_surface_show_glyphs (void			*abstract_surface,
 				cairo_scaled_font_t	*scaled_font)
 {
     cairo_pdf_surface_t *surface = abstract_surface;
-    int current_subset_id = -1;
+    unsigned int current_subset_id = (unsigned int)-1;
     unsigned int font_id, subset_id, subset_glyph_index;
     cairo_status_t status;
     int i;
diff --git a/src/cairo-png.c b/src/cairo-png.c
index d65601635..63966b5a7 100644
--- a/src/cairo-png.c
+++ b/src/cairo-png.c
@@ -43,7 +43,7 @@
 static void
 unpremultiply_data (png_structp png, png_row_infop row_info, png_bytep data)
 {
-    int i;
+    unsigned int i;
 
     for (i = 0; i < row_info->rowbytes; i += 4) {
         uint8_t *b = &data[i];
@@ -67,7 +67,7 @@ unpremultiply_data (png_structp png, png_row_infop row_info, png_bytep data)
 static void
 convert_data_to_bytes (png_structp png, png_row_infop row_info, png_bytep data)
 {
-    int i;
+    unsigned int i;
 
     for (i = 0; i < row_info->rowbytes; i += 4) {
         uint8_t *b = &data[i];
@@ -301,7 +301,7 @@ premultiply_data (png_structp   png,
                   png_row_infop row_info,
                   png_bytep     data)
 {
-    int i;
+    unsigned int i;
 
     for (i = 0; i < row_info->rowbytes; i += 4) {
 	uint8_t *base = &data[i];
@@ -332,7 +332,7 @@ read_png (png_rw_ptr	read_func,
 {
     cairo_surface_t *surface = (cairo_surface_t*) &_cairo_surface_nil;
     png_byte *data = NULL;
-    int i;
+    unsigned int i;
     png_struct *png = NULL;
     png_info *info;
     png_uint_32 png_width, png_height, stride;
diff --git a/src/cairo-ps-surface.c b/src/cairo-ps-surface.c
index 3856aa231..37394a8ac 100644
--- a/src/cairo-ps-surface.c
+++ b/src/cairo-ps-surface.c
@@ -2056,7 +2056,7 @@ _cairo_ps_surface_show_glyphs (void		     *abstract_surface,
 {
     cairo_ps_surface_t *surface = abstract_surface;
     cairo_output_stream_t *stream = surface->stream;
-    int current_subset_id = -1;
+    unsigned int current_subset_id = -1;
     unsigned int font_id, subset_id, subset_glyph_index;
     cairo_status_t status;
     int i;
diff --git a/src/cairo-scaled-font-subsets.c b/src/cairo-scaled-font-subsets.c
index 112925cd1..0c428e7c3 100644
--- a/src/cairo-scaled-font-subsets.c
+++ b/src/cairo-scaled-font-subsets.c
@@ -73,9 +73,9 @@ typedef struct _cairo_sub_font_glyph {
 
 typedef struct _cairo_sub_font_collection {
     unsigned long *glyphs; /* scaled_font_glyph_index */
-    int glyphs_size;
-    int max_glyph;
-    int num_glyphs;
+    unsigned int glyphs_size;
+    unsigned int max_glyph;
+    unsigned int num_glyphs;
 
     unsigned int subset_id;
 
diff --git a/src/cairo-scaled-font.c b/src/cairo-scaled-font.c
index d651e0103..ac229d035 100644
--- a/src/cairo-scaled-font.c
+++ b/src/cairo-scaled-font.c
@@ -758,7 +758,7 @@ _cairo_scaled_font_text_to_glyphs (cairo_scaled_font_t *scaled_font,
 				   cairo_glyph_t      **glyphs,
 				   int 		       *num_glyphs)
 {
-    size_t i;
+    int i;
     uint32_t *ucs4 = NULL;
     cairo_status_t status = CAIRO_STATUS_SUCCESS;
     cairo_scaled_glyph_t *scaled_glyph;
diff --git a/src/cairo-svg-surface.c b/src/cairo-svg-surface.c
index b3915064a..0843e3b9b 100644
--- a/src/cairo-svg-surface.c
+++ b/src/cairo-svg-surface.c
@@ -898,7 +898,7 @@ emit_meta_surface (cairo_svg_document_t *document,
     cairo_output_stream_t *contents;
     cairo_meta_surface_t *meta;
     cairo_meta_snapshot_t *snapshot;
-    int num_elements;
+    unsigned int num_elements;
     unsigned int i, id;
 
     num_elements = document->meta_snapshots.num_elements;
@@ -1100,7 +1100,7 @@ emit_pattern_stops (cairo_output_stream_t *output,
 		    double start_offset)
 {
     double offset;
-    int i;
+    unsigned int i;
 
     for (i = 0; i < pattern->n_stops; i++) {
 	offset = start_offset + (1 - start_offset ) *
@@ -1602,7 +1602,7 @@ _cairo_svg_surface_intersect_clip_path (void			*dst,
     cairo_svg_surface_t *surface = dst;
     cairo_svg_document_t *document = surface->document;
     cairo_status_t status;
-    int i;
+    unsigned int i;
 
     if (path == NULL) {
  	for (i = 0; i < surface->clip_level; i++)
diff --git a/src/cairo-xlib-surface.c b/src/cairo-xlib-surface.c
index 58ad45996..7e96e8735 100644
--- a/src/cairo-xlib-surface.c
+++ b/src/cairo-xlib-surface.c
@@ -747,7 +747,7 @@ _draw_image_surface (cairo_xlib_surface_t   *surface,
 		     int                    dst_y)
 {
     XImage ximage;
-    int bpp, alpha, red, green, blue;
+    unsigned int bpp, alpha, red, green, blue;
     int native_byte_order = _native_byte_order_lsb () ? LSBFirst : MSBFirst;
 
     pixman_format_get_masks (pixman_image_get_format (image->pixman_image),
diff --git a/src/cairoint.h b/src/cairoint.h
index f690a9a13..fb5d778be 100644
--- a/src/cairoint.h
+++ b/src/cairoint.h
@@ -352,9 +352,9 @@ _cairo_rectangle_intersect (cairo_rectangle_int16_t *dest, cairo_rectangle_int16
 
 typedef struct _cairo_array cairo_array_t;
 struct _cairo_array {
-    int size;
-    int num_elements;
-    int element_size;
+    unsigned int size;
+    unsigned int num_elements;
+    unsigned int element_size;
     char **elements;
 
     cairo_bool_t is_snapshot;
@@ -374,7 +374,7 @@ cairo_private cairo_status_t
 _cairo_array_grow_by (cairo_array_t *array, int additional);
 
 cairo_private void
-_cairo_array_truncate (cairo_array_t *array, int length);
+_cairo_array_truncate (cairo_array_t *array, unsigned int num_elements);
 
 cairo_private cairo_status_t
 _cairo_array_append (cairo_array_t *array, const void *element);
@@ -386,11 +386,11 @@ _cairo_array_append_multiple (cairo_array_t	*array,
 
 cairo_private cairo_status_t
 _cairo_array_allocate (cairo_array_t	 *array,
-		       int		  num_elements,
+		       unsigned int	  num_elements,
 		       void		**elements);
 
 cairo_private void *
-_cairo_array_index (cairo_array_t *array, int index);
+_cairo_array_index (cairo_array_t *array, unsigned int index);
 
 cairo_private void
 _cairo_array_copy_element (cairo_array_t *array, int index, void *dst);
@@ -620,7 +620,7 @@ typedef struct _cairo_stroke_style {
     cairo_line_join_t	 line_join;
     double		 miter_limit;
     double		*dash;
-    int			 num_dashes;
+    unsigned int	 num_dashes;
     double		 dash_offset;
 } cairo_stroke_style_t;
 
@@ -970,7 +970,7 @@ typedef struct _cairo_gradient_pattern {
     cairo_pattern_t base;
 
     pixman_gradient_stop_t *stops;
-    int			   n_stops;
+    unsigned int	   n_stops;
 } cairo_gradient_pattern_t;
 
 typedef struct _cairo_linear_pattern {