[cairo-commit] pycairo/cairo pycairo-surface.c, 1.45, 1.46 cairosvgmodule.c, 1.8, 1.9

[Steve Chaplin]

Committed by: stevech1097

Update of /cvs/cairo/pycairo/cairo
In directory gabe:/tmp/cvs-serv331/cairo

Modified Files:
	pycairo-surface.c cairosvgmodule.c 
Log Message:
SC

Index: pycairo-surface.c
===================================================================
RCS file: /cvs/cairo/pycairo/cairo/pycairo-surface.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- pycairo-surface.c	1 Jun 2005 12:29:02 -0000	1.45
+++ pycairo-surface.c	20 Jun 2005 07:17:11 -0000	1.46
@@ -306,11 +306,13 @@
 			"array must be MxN or MxNxP where P is 1, 3 or 4");
 	return NULL;
     }
-    surface = cairo_image_surface_create_for_data(array->data, 
-						  format,
-						  array->dimensions[1],
-						  array->dimensions[0],
-						  array->strides[0]);
+    surface = cairo_image_surface_create_for_data(
+		                          (unsigned char *) array->data, 
+					  format,
+					  array->dimensions[1],
+					  array->dimensions[0],
+					  array->strides[0]);
+
     if (!surface)
 	return PyErr_NoMemory();
     return PycairoSurface_FromSurface(surface, &PycairoImageSurface_Type, 

Index: cairosvgmodule.c
===================================================================
RCS file: /cvs/cairo/pycairo/cairo/cairosvgmodule.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- cairosvgmodule.c	20 May 2005 08:57:44 -0000	1.8
+++ cairosvgmodule.c	20 Jun 2005 07:17:11 -0000	1.9
@@ -184,7 +184,7 @@
 static PyObject *
 pycairosvg_get_size (PycairoSVGContext *o, void *closure)
 {
-    int width, height;
+    unsigned int width, height;
     svg_cairo_get_size (o->ctx, &width, &height);
     return Py_BuildValue("ii", width, height);
 }