[cairo-commit] pycairo/cairo pycairo-surface.c, 1.29, 1.30 pycairo-context.c, 1.39, 1.40

[Steve Chaplin]

Committed by: stevech1097

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

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

Index: pycairo-surface.c
===================================================================
RCS file: /cvs/cairo/pycairo/cairo/pycairo-surface.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- pycairo-surface.c	27 Apr 2005 07:34:50 -0000	1.29
+++ pycairo-surface.c	28 Apr 2005 01:46:36 -0000	1.30
@@ -454,11 +454,10 @@
 image_surface_create_from_png(PyTypeObject *type, PyObject *args)
 {
     PyObject *s;
-    char *filename;
+    const char *filename;
     cairo_surface_t *surface;
 
-    if (!PyArg_ParseTuple(args, "S:Surface.create_from_png",
-			  filename))
+    if (!PyArg_ParseTuple(args, "s:Surface.create_from_png", &filename))
 	return NULL;
 
     surface = cairo_image_surface_create_from_png(filename);

Index: pycairo-context.c
===================================================================
RCS file: /cvs/cairo/pycairo/cairo/pycairo-context.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- pycairo-context.c	27 Apr 2005 07:34:50 -0000	1.39
+++ pycairo-context.c	28 Apr 2005 01:46:36 -0000	1.40
@@ -1183,6 +1183,7 @@
     { "arc",           (PyCFunction)pycairo_arc,           METH_VARARGS },
     { "arc_negative",  (PyCFunction)pycairo_arc_negative,  METH_VARARGS },
     { "clip",          (PyCFunction)pycairo_clip,          METH_NOARGS },
+    { "clip_preserve", (PyCFunction)pycairo_clip_preserve, METH_NOARGS },
     { "close_path",    (PyCFunction)pycairo_close_path,    METH_NOARGS },
     { "copy",          (PyCFunction)pycairo_copy,          METH_VARARGS },
     { "copy_page",     (PyCFunction)pycairo_copy_page,     METH_NOARGS },
@@ -1193,6 +1194,7 @@
     { "device_to_user_distance",
       (PyCFunction)pycairo_device_to_user_distance,        METH_VARARGS },
     { "fill",          (PyCFunction)pycairo_fill,          METH_NOARGS },
+    { "fill_preserve", (PyCFunction)pycairo_fill_preserve, METH_NOARGS },
     { "get_path",      (PyCFunction)pycairo_get_path,      METH_VARARGS },
     { "get_path_flat", (PyCFunction)pycairo_get_path_flat, METH_VARARGS },
     /* glyph_extents */