[cairo-commit] pycairo/cairo pycairo-surface.c, 1.86, 1.87 pycairo-pattern.c, 1.38, 1.39 pycairo-context.c, 1.85, 1.86 pycairo-font.c, 1.36, 1.37

[Steve Chaplin]

Committed by: stevech1097

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

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

Index: pycairo-surface.c
===================================================================
RCS file: /cvs/cairo/pycairo/cairo/pycairo-surface.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- pycairo-surface.c	17 Jan 2007 05:40:01 -0000	1.86
+++ pycairo-surface.c	11 Dec 2007 02:56:48 -0000	1.87
@@ -136,9 +136,6 @@
 static void
 surface_dealloc (PycairoSurface *o)
 {
-#ifdef DEBUG
-    printf("surface_dealloc start\n");
-#endif
     if (o->surface) {
 	cairo_surface_destroy(o->surface);
 	o->surface = NULL;
@@ -146,9 +143,6 @@
     Py_CLEAR(o->base);
 
     o->ob_type->tp_free((PyObject *)o);
-#ifdef DEBUG
-    printf("surface_dealloc end\n");
-#endif
 }
 
 static PyObject *

Index: pycairo-pattern.c
===================================================================
RCS file: /cvs/cairo/pycairo/cairo/pycairo-pattern.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- pycairo-pattern.c	16 Jan 2007 14:59:34 -0000	1.38
+++ pycairo-pattern.c	11 Dec 2007 02:56:48 -0000	1.39
@@ -92,17 +92,11 @@
 static void
 pattern_dealloc (PycairoPattern *o)
 {
-#ifdef DEBUG
-    printf("pattern_dealloc start\n");
-#endif
     if (o->pattern) {
 	cairo_pattern_destroy (o->pattern);
 	o->pattern = NULL;
     }
     o->ob_type->tp_free((PyObject *)o);
-#ifdef DEBUG
-    printf("pattern_dealloc end\n");
-#endif
 }
 
 static PyObject *

Index: pycairo-context.c
===================================================================
RCS file: /cvs/cairo/pycairo/cairo/pycairo-context.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- pycairo-context.c	10 Dec 2007 15:16:15 -0000	1.85
+++ pycairo-context.c	11 Dec 2007 02:56:48 -0000	1.86
@@ -61,11 +61,11 @@
 /* PycairoContext_FromContext
  * Create a new PycairoContext from a cairo_t
  * ctx  - a cairo_t to 'wrap' into a Python object.
- *        it is unreferenced if the PycairoContext creation fails, or if
- *        the cairo_t has an error status
- * type - the type of the object to instantiate; it can be NULL,
- *        meaning a base cairo.Context type, or it can be a subclass of
- *        cairo.Context.
+ *        It is unreferenced if the PycairoContext creation fails, or if
+ *        the cairo_t has an error status.
+ * type - a pointer to the type to instantiate.
+ *        It can be &PycairoContext_Type, or a PycairoContext_Type subtype.
+ *        (cairo.Context or a cairo.Context subclass)
  * base - the base object used to create the context, or NULL.
  *        it is referenced to keep it alive while the cairo_t is being used
  * Return value: New reference or NULL on failure
@@ -82,8 +82,6 @@
 	return NULL;
     }
 
-    if (type == NULL)
-        type = &PycairoContext_Type;
     o = PycairoContext_Type.tp_alloc (type, 0);
     if (o) {
 	((PycairoContext *)o)->ctx = ctx;
@@ -98,9 +96,6 @@
 static void
 pycairo_dealloc(PycairoContext *o)
 {
-#ifdef DEBUG
-    printf("context_dealloc start\n");
-#endif
     if (o->ctx) {
 	cairo_destroy(o->ctx);
 	o->ctx = NULL;
@@ -108,9 +103,6 @@
     Py_CLEAR(o->base);
 
     o->ob_type->tp_free((PyObject *)o);
-#ifdef DEBUG
-    printf("context_dealloc end\n");
-#endif
 }
 
 static PyObject *

Index: pycairo-font.c
===================================================================
RCS file: /cvs/cairo/pycairo/cairo/pycairo-font.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- pycairo-font.c	16 Jan 2007 14:59:34 -0000	1.36
+++ pycairo-font.c	11 Dec 2007 02:56:48 -0000	1.37
@@ -68,17 +68,11 @@
 static void
 font_face_dealloc (PycairoFontFace *o)
 {
-#ifdef DEBUG
-    printf("font_face_dealloc start\n");
-#endif
     if (o->font_face) {
 	cairo_font_face_destroy (o->font_face);
 	o->font_face = NULL;
     }
     o->ob_type->tp_free((PyObject *) o);
-#ifdef DEBUG
-    printf("font_face_dealloc end\n");
-#endif
 }
 
 static PyObject *
@@ -179,17 +173,11 @@
 static void
 scaled_font_dealloc(PycairoScaledFont *o)
 {
-#ifdef DEBUG
-    printf("scaled_font_dealloc start\n");
-#endif
     if (o->scaled_font) {
 	cairo_scaled_font_destroy (o->scaled_font);
 	o->scaled_font = NULL;
     }
     o->ob_type->tp_free((PyObject *) o);
-#ifdef DEBUG
-    printf("scaled_font_dealloc end\n");
-#endif
 }
 
 static PyObject *
@@ -344,17 +332,11 @@
 static void
 font_options_dealloc(PycairoFontOptions *o)
 {
-#ifdef DEBUG
-    printf("font_options_dealloc start\n");
-#endif
     if (o->font_options) {
 	cairo_font_options_destroy (o->font_options);
 	o->font_options = NULL;
     }
     o->ob_type->tp_free((PyObject *) o);
-#ifdef DEBUG
-    printf("font_options_dealloc end\n");
-#endif
 }
 
 static PyObject *