SC 2005/03/19

Steve Chaplin · Steve Chaplin · commit cd4beedccffd · 2005-03-19T05:57:39.000Z
svn path=/trunk/matplotlib/; revision=1090
diff --git a/src/_backend_gdk.c b/src/_backend_gdk.c
@@ -24,34 +24,33 @@ static PyTypeObject *_PyGdkPixbuf_Type;
 static PyObject *
 pixbuf_get_pixels_array(PyObject *self, PyObject *args)
 {
-    /* 1) read in Python pixbuf, get the underlying C pixbuf */
+    /* 1) read in Python pixbuf, get the underlying gdk_pixbuf */
     PyGObject *py_pixbuf;
-    GdkPixbuf *pixbuf;
+    GdkPixbuf *gdk_pixbuf;
     PyArrayObject *array;
     int dims[3] = { 0, 0, 3 };
 
     if (!PyArg_ParseTuple(args, "O!:pixbuf_get_pixels_array",
 			  &PyGdkPixbuf_Type, &py_pixbuf))
 	return NULL;
 
-    pixbuf = GDK_PIXBUF(py_pixbuf->obj);
+    gdk_pixbuf = GDK_PIXBUF(py_pixbuf->obj);
 
     /* 2) same as pygtk/gtk/gdk.c _wrap_gdk_pixbuf_get_pixels_array()
      * with 'self' changed to py_pixbuf
      */
 
-    dims[0] = gdk_pixbuf_get_height(pixbuf);
-    dims[1] = gdk_pixbuf_get_width(pixbuf);
-    if (gdk_pixbuf_get_has_alpha(pixbuf))
+    dims[0] = gdk_pixbuf_get_height(gdk_pixbuf);
+    dims[1] = gdk_pixbuf_get_width(gdk_pixbuf);
+    if (gdk_pixbuf_get_has_alpha(gdk_pixbuf))
         dims[2] = 4;
 
     array = (PyArrayObject *)PyArray_FromDimsAndData(3, dims, PyArray_UBYTE,
-                                        (char *)gdk_pixbuf_get_pixels(pixbuf));
-
+			     (char *)gdk_pixbuf_get_pixels(gdk_pixbuf));
     if (array == NULL)
         return NULL;
 
-    array->strides[0] = gdk_pixbuf_get_rowstride(pixbuf);
+    array->strides[0] = gdk_pixbuf_get_rowstride(gdk_pixbuf);
     /* the array holds a ref to the pixbuf pixels through this wrapper*/
     Py_INCREF(py_pixbuf);
     array->base = (PyObject *)py_pixbuf;
