[cairo-commit] cairo/src cairo-glitz-surface.c, 1.38, 1.39 cairo-image-surface.c, 1.41, 1.42 cairo-xlib-surface.c, 1.63, 1.64 cairoint.h, 1.139, 1.140

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/cairo/src
In directory gabe:/tmp/cvs-serv24751/src

Modified Files:
	cairo-glitz-surface.c cairo-image-surface.c 
	cairo-xlib-surface.c cairoint.h 
Log Message:

        * src/cairoint.h:
        * src/cairo-image-surface.c: (_cairo_image_surface_create_with_masks):
          Fix image->data to be unsigned

        * src/cairo-glitz-surface.c: (_cairo_glitz_surface_get_image):
        * src/cairo-image-surface.c:
        (_cairo_image_surface_create_for_pixman_image),
        * src/cairo-xlib-surface.c: (_get_image_surface),
        (_draw_image_surface), (_xlib_glyphset_cache_create_entry):
        Track change in signedness of data member/parameter.


Index: cairo-glitz-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-glitz-surface.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- cairo-glitz-surface.c	11 May 2005 20:53:18 -0000	1.38
+++ cairo-glitz-surface.c	13 May 2005 06:11:55 -0000	1.39
@@ -106,7 +106,7 @@
     cairo_image_surface_t *image;
     int			  x1, y1, x2, y2;
     int			  width, height;
-    char		  *pixels;
+    unsigned char	  *pixels;
     cairo_format_masks_t  format;
     glitz_buffer_t	  *buffer;
     glitz_pixel_format_t  pf;

Index: cairo-image-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-image-surface.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- cairo-image-surface.c	9 May 2005 16:12:52 -0000	1.41
+++ cairo-image-surface.c	13 May 2005 06:11:55 -0000	1.42
@@ -68,7 +68,7 @@
     surface->pixman_image = pixman_image;
 
     surface->format = format;
-    surface->data = (char *) pixman_image_get_data (pixman_image);
+    surface->data = (unsigned char *) pixman_image_get_data (pixman_image);
     surface->owns_data = 0;
 
     surface->width = pixman_image_get_width (pixman_image);
@@ -80,8 +80,8 @@
 }
 
 cairo_image_surface_t *
-_cairo_image_surface_create_with_masks (char			*data,
-					cairo_format_masks_t	*format,
+_cairo_image_surface_create_with_masks (unsigned char	       *data,
+					cairo_format_masks_t   *format,
 					int			width,
 					int			height,
 					int			stride)

Index: cairo-xlib-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-xlib-surface.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- cairo-xlib-surface.c	11 May 2005 04:06:01 -0000	1.63
+++ cairo-xlib-surface.c	13 May 2005 06:11:55 -0000	1.64
@@ -284,7 +284,7 @@
 	masks.green_mask = surface->visual->green_mask;
 	masks.blue_mask = surface->visual->blue_mask;
 
-	image = _cairo_image_surface_create_with_masks (ximage->data,
+	image = _cairo_image_surface_create_with_masks ((unsigned char *) ximage->data,
 							&masks,
 							ximage->width, 
 							ximage->height,
@@ -345,7 +345,7 @@
 			   image->depth,
 			   ZPixmap,
 			   0,
-			   image->data,
+			   (char *) image->data,
 			   image->width,
 			   image->height,
 			   bitmap_pad,
@@ -1227,7 +1227,7 @@
 
     XRenderAddGlyphs (g->display, g->glyphset,
 		      &(v->glyph), &(v->info), 1,
-		      im->image ? im->image->data : NULL,
+		      im->image ? (char *) im->image->data : NULL,
 		      im->image ? v->info.height * v->info.width : 0);
 
     v->key.base.memory = im->image ? im->image->width * im->image->stride : 0;

Index: cairoint.h
===================================================================
RCS file: /cvs/cairo/cairo/src/cairoint.h,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -d -r1.139 -r1.140
--- cairoint.h	10 May 2005 19:22:41 -0000	1.139
+++ cairoint.h	13 May 2005 06:11:55 -0000	1.140
@@ -725,7 +725,7 @@
 
     /* libic-specific fields */
     cairo_format_t format;
-    char *data;
+    unsigned char *data;
     int owns_data;
 
     int width;
@@ -1514,8 +1514,8 @@
 /* cairo_image_surface.c */
 
 cairo_private cairo_image_surface_t *
-_cairo_image_surface_create_with_masks (char			*data,
-					cairo_format_masks_t	*format,
+_cairo_image_surface_create_with_masks (unsigned char	       *data,
+					cairo_format_masks_t   *format,
 					int			width,
 					int			height,
 					int			stride);