Attachment 8464 Details for Bug 9715 – Better patch (upload the right one this time!)

[patch] Better patch (upload the right one this time!)

pycairo.patch (text/plain), 2.41 KB, created by Marco Pesenti Gritti on 2007-01-19 13:39:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marco Pesenti Gritti

Created: 2007-01-19 13:39:42 UTC

Size: 2.41 KB

patch

obsolete

>? config.guess
>? config.sub
>? ltmain.sh
>Index: cairo/pycairo-context.c
>===================================================================
>RCS file: /cvs/cairo/pycairo/cairo/pycairo-context.c,v
>retrieving revision 1.82
>diff -u -r1.82 pycairo-context.c
>--- cairo/pycairo-context.c	18 Jan 2007 23:21:23 -0000	1.82
>+++ cairo/pycairo-context.c	19 Jan 2007 21:36:40 -0000
>@@ -202,12 +202,12 @@
>  * typical rectangle_list a simple Python tuple in fine?
>  */
> static PyObject *
>-pycairo_copy_clip_rectangles (PycairoContext *o)
>+pycairo_copy_clip_rectangle_list (PycairoContext *o)
> {
>     int i;
>     PyObject *rv = NULL;
>     cairo_rectangle_t *r;
>-    cairo_rectangle_list_t *rlist = cairo_copy_clip_rectangles (o->ctx);
>+    cairo_rectangle_list_t *rlist = cairo_copy_clip_rectangle_list (o->ctx);
>     if (rlist->status != CAIRO_STATUS_SUCCESS) {
> 	Pycairo_Check_Status (rlist->status);
> 	goto exit;
>@@ -346,20 +346,15 @@
> pycairo_get_dash (PycairoContext *o)
> {
>     double *dashes = NULL, offset;
>-    int count = 0, i;
>+    int count, i;
>     PyObject *py_dashes = NULL, *rv = NULL;
>-    cairo_status_t status;
> 
>-    cairo_get_dash_count (o->ctx, &count);
>+    count = cairo_get_dash_count (o->ctx);
>     dashes = PyMem_Malloc (count * sizeof(double));
>     if (dashes == NULL)
> 	return PyErr_NoMemory();
> 
>-    status = cairo_get_dash (o->ctx, dashes, &offset);
>-    if (status != CAIRO_STATUS_SUCCESS) {
>-	Pycairo_Check_Status (status);
>-	goto exit;
>-    }
>+    cairo_get_dash (o->ctx, dashes, &offset);
> 
>     py_dashes = PyTuple_New(count);
>     if (py_dashes == NULL)
>@@ -382,8 +377,8 @@
> static PyObject *
> pycairo_get_dash_count (PycairoContext *o)
> {
>-    int count = 0;
>-    cairo_get_dash_count (o->ctx, &count);
>+    int count;
>+    count = cairo_get_dash_count (o->ctx);
>     return PyInt_FromLong (count);
> }
> 
>@@ -1314,7 +1309,7 @@
>     {"clip_extents",    (PyCFunction)pycairo_clip_extents,    METH_NOARGS},
>     {"clip_preserve",   (PyCFunction)pycairo_clip_preserve,   METH_NOARGS},
>     {"close_path",      (PyCFunction)pycairo_close_path,      METH_NOARGS},
>-    {"copy_clip_rectangles", (PyCFunction)pycairo_copy_clip_rectangles,
>+    {"copy_clip_rectangle_list", (PyCFunction)pycairo_copy_clip_rectangle_list,
>                                                               METH_NOARGS},
>     {"copy_page",       (PyCFunction)pycairo_copy_page,       METH_NOARGS},
>     {"copy_path",       (PyCFunction)pycairo_copy_path,       METH_NOARGS},

Actions: View | Splinter Review

Attachments on bug 9715: 8462 | 8463 | 8464

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.