[cairo-commit] pycairo/cairo pycairo-surface.c,1.76,1.77

[Steve Chaplin]

Committed by: stevech1097

Update of /cvs/cairo/pycairo/cairo
In directory kemper:/tmp/cvs-serv30747/cairo

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

Index: pycairo-surface.c
===================================================================
RCS file: /cvs/cairo/pycairo/cairo/pycairo-surface.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- pycairo-surface.c	25 Jun 2006 05:54:34 -0000	1.76
+++ pycairo-surface.c	26 Jun 2006 13:59:35 -0000	1.77
@@ -562,7 +562,6 @@
     return PyInt_FromLong (cairo_image_surface_get_stride (o->surface));
 }
 
-#ifdef HAVE_GETDATA
 /* This was modified from cairo/src/cairo-png.c unpremultiply_data() */
 /* ARGB32 (native-endian, premultiplied) => RGBA */
 static void
@@ -590,10 +589,6 @@
 
 /* return a Python buffer object containing the ImageSurface data in RGBA
  * format.
- * It requires a patched version of cairo which provides:
- * cairo_image_surface_get_data()
- * cairo_image_surface_get_format()
- * cairo_image_surface_get_stride()
  */
 static PyObject *
 image_surface_to_rgba (PycairoImageSurface *o)
@@ -625,7 +620,6 @@
     }
     return buf;
 }
-#endif
 
 static PyMethodDef image_surface_methods[] = {
 #ifdef HAVE_NUMPY
@@ -642,9 +636,7 @@
     {"get_height",    (PyCFunction)image_surface_get_height,     METH_NOARGS},
     {"get_width",     (PyCFunction)image_surface_get_width,      METH_NOARGS},
     {"get_stride",    (PyCFunction)image_surface_get_stride,     METH_NOARGS},
-#ifdef HAVE_GETDATA
     {"to_rgba",       (PyCFunction)image_surface_to_rgba,        METH_NOARGS},
-#endif
     {NULL, NULL, 0, NULL},
 };