[cairo-commit] pycairo/cairo cairomodule.c, 1.46, 1.47 cairosvgmodule.c, 1.10, 1.11 pycairo-context.c, 1.63, 1.64 pycairo-font.c, 1.27, 1.28 pycairo-matrix.c, 1.22, 1.23 pycairo-path.c, 1.7, 1.8 pycairo-pattern.c, 1.26, 1.27 pycairo-surface.c, 1.53, 1.54

Steve Chaplin commit at pdx.freedesktop.org
Thu Aug 18 19:46:57 PDT 2005


Committed by: stevech1097

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

Modified Files:
	cairomodule.c cairosvgmodule.c pycairo-context.c 
	pycairo-font.c pycairo-matrix.c pycairo-path.c 
	pycairo-pattern.c pycairo-surface.c 
Log Message:
'SC'

Index: cairomodule.c
===================================================================
RCS file: /cvs/cairo/pycairo/cairo/cairomodule.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- cairomodule.c	9 Aug 2005 10:54:44 -0000	1.46
+++ cairomodule.c	19 Aug 2005 02:46:54 -0000	1.47
@@ -108,34 +108,46 @@
 {
     PyObject *m;
 
+    PycairoContext_Type.tp_base = &PyBaseObject_Type;
     if (PyType_Ready(&PycairoContext_Type) < 0)
         return;
+    PycairoFontFace_Type.tp_base = &PyBaseObject_Type;
     if (PyType_Ready(&PycairoFontFace_Type) < 0)
         return;
+    PycairoFontOptions_Type.tp_base = &PyBaseObject_Type;
     if (PyType_Ready(&PycairoFontOptions_Type) < 0)
         return;
+    PycairoMatrix_Type.tp_base = &PyBaseObject_Type;
     if (PyType_Ready(&PycairoMatrix_Type) < 0)
         return;
+    PycairoPath_Type.tp_base = &PyBaseObject_Type;
     if (PyType_Ready(&PycairoPath_Type) < 0)
 	return;
+    PycairoPattern_Type.tp_base = &PyBaseObject_Type;
     if (PyType_Ready(&PycairoPattern_Type) < 0)
         return;
+    PycairoScaledFont_Type.tp_base = &PyBaseObject_Type;
     if (PyType_Ready(&PycairoScaledFont_Type) < 0)
         return;
 
+    PycairoSurface_Type.tp_base = &PyBaseObject_Type;
     if (PyType_Ready(&PycairoSurface_Type) < 0)
         return;
+    PycairoImageSurface_Type.tp_base = &PycairoSurface_Type;
     if (PyType_Ready(&PycairoImageSurface_Type) < 0)
         return;
 #ifdef CAIRO_HAS_PDF_SURFACE
+    PycairoPDFSurface_Type.tp_base = &PycairoSurface_Type;
     if (PyType_Ready(&PycairoPDFSurface_Type) < 0)
         return;
 #endif
 #ifdef CAIRO_HAS_PS_SURFACE
+    PycairoPSSurface_Type.tp_base = &PycairoSurface_Type;
     if (PyType_Ready(&PycairoPSSurface_Type) < 0)
         return;
 #endif
 #ifdef CAIRO_HAS_WIN32_SURFACE
+    PycairoWin32Surface_Type.tp_base = &PycairoSurface_Type;
     if (PyType_Ready(&PycairoWin32Surface_Type) < 0)
         return;
 #endif

Index: cairosvgmodule.c
===================================================================
RCS file: /cvs/cairo/pycairo/cairo/cairosvgmodule.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- cairosvgmodule.c	18 Aug 2005 15:21:20 -0000	1.10
+++ cairosvgmodule.c	19 Aug 2005 02:46:54 -0000	1.11
@@ -51,6 +51,7 @@
 {
     PyObject* m;
 
+    PycairoSVGContext_Type.tp_base = &PyBaseObject_Type;
     if (PyType_Ready(&PycairoSVGContext_Type) < 0)
         return;
 
@@ -236,7 +237,7 @@
     pycairosvg_methods,        		/* tp_methods */
     0,                         		/* tp_members */
     0,        		                /* tp_getset */
-    0,                         		/* tp_base */
+    0, /* &PyBaseObject_Type, */        /* tp_base */
     0,                         		/* tp_dict */
     0,                         		/* tp_descr_get */
     0,                         		/* tp_descr_set */

Index: pycairo-context.c
===================================================================
RCS file: /cvs/cairo/pycairo/cairo/pycairo-context.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- pycairo-context.c	18 Aug 2005 15:21:20 -0000	1.63
+++ pycairo-context.c	19 Aug 2005 02:46:54 -0000	1.64
@@ -1220,7 +1220,7 @@
     pycairo_methods,                    /* tp_methods */
     0,                                  /* tp_members */
     0,                                  /* tp_getset */
-    &PyBaseObject_Type,                 /* tp_base */
+    0, /* &PyBaseObject_Type, */        /* tp_base */
     0,                                  /* tp_dict */
     0,                                  /* tp_descr_get */
     0,                                  /* tp_descr_set */

Index: pycairo-font.c
===================================================================
RCS file: /cvs/cairo/pycairo/cairo/pycairo-font.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- pycairo-font.c	18 Aug 2005 15:21:20 -0000	1.27
+++ pycairo-font.c	19 Aug 2005 02:46:54 -0000	1.28
@@ -132,7 +132,7 @@
     0,                                  /* tp_methods */
     0,                                  /* tp_members */
     0,                                  /* tp_getset */
-    &PyBaseObject_Type,                 /* tp_base */
+    0, /* &PyBaseObject_Type, */        /* tp_base */
     0,                                  /* tp_dict */
     0,                                  /* tp_descr_get */
     0,                                  /* tp_descr_set */
@@ -274,7 +274,7 @@
     scaled_font_methods,                /* tp_methods */
     0,                                  /* tp_members */
     0,                                  /* tp_getset */
-    &PyBaseObject_Type,                 /* tp_base */
+    0, /* &PyBaseObject_Type, */        /* tp_base */
     0,                                  /* tp_dict */
     0,                                  /* tp_descr_get */
     0,                                  /* tp_descr_set */
@@ -400,7 +400,7 @@
     font_options_methods,               /* tp_methods */
     0,                                  /* tp_members */
     0,                                  /* tp_getset */
-    &PyBaseObject_Type,                 /* tp_base */
+    0, /* &PyBaseObject_Type, */        /* tp_base */
     0,                                  /* tp_dict */
     0,                                  /* tp_descr_get */
     0,                                  /* tp_descr_set */

Index: pycairo-matrix.c
===================================================================
RCS file: /cvs/cairo/pycairo/cairo/pycairo-matrix.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- pycairo-matrix.c	18 Aug 2005 15:21:20 -0000	1.22
+++ pycairo-matrix.c	19 Aug 2005 02:46:55 -0000	1.23
@@ -344,7 +344,7 @@
     matrix_methods,                     /* tp_methods */
     0,                                  /* tp_members */
     matrix_getsets,                     /* tp_getset */
-    &PyBaseObject_Type,                 /* tp_base */
+    0, /* &PyBaseObject_Type, */        /* tp_base */
     0,                                  /* tp_dict */
     0,                                  /* tp_descr_get */
     0,                                  /* tp_descr_set */

Index: pycairo-path.c
===================================================================
RCS file: /cvs/cairo/pycairo/cairo/pycairo-path.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- pycairo-path.c	18 Aug 2005 15:21:20 -0000	1.7
+++ pycairo-path.c	19 Aug 2005 02:46:55 -0000	1.8
@@ -212,7 +212,7 @@
     0,			        	/* tp_methods */
     0,					/* tp_members */
     0,					/* tp_getset */
-    0,					/* tp_base */
+    0, /* &PyBaseObject_Type, */        /* tp_base */
     0,					/* tp_dict */
     0,					/* tp_descr_get */
     0,					/* tp_descr_set */

Index: pycairo-pattern.c
===================================================================
RCS file: /cvs/cairo/pycairo/cairo/pycairo-pattern.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- pycairo-pattern.c	18 Aug 2005 15:21:20 -0000	1.26
+++ pycairo-pattern.c	19 Aug 2005 02:46:55 -0000	1.27
@@ -278,7 +278,7 @@
     pattern_methods,                    /* tp_methods */
     0,                                  /* tp_members */
     0,                                  /* tp_getset */
-    &PyBaseObject_Type,                 /* tp_base */
+    0, /* &PyBaseObject_Type, */        /* tp_base */
     0,                                  /* tp_dict */
     0,                                  /* tp_descr_get */
     0,                                  /* tp_descr_set */

Index: pycairo-surface.c
===================================================================
RCS file: /cvs/cairo/pycairo/cairo/pycairo-surface.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- pycairo-surface.c	18 Aug 2005 15:21:20 -0000	1.53
+++ pycairo-surface.c	19 Aug 2005 02:46:55 -0000	1.54
@@ -262,7 +262,7 @@
     surface_methods,                    /* tp_methods */
     0,                                  /* tp_members */
     0,                                  /* tp_getset */
-    &PyBaseObject_Type,                 /* tp_base */
+    0, /* &PyBaseObject_Type, */        /* tp_base */
     0,                                  /* tp_dict */
     0,                                  /* tp_descr_get */
     0,                                  /* tp_descr_set */
@@ -523,7 +523,7 @@
     image_surface_methods,              /* tp_methods */
     0,                                  /* tp_members */
     0,                                  /* tp_getset */
-    &PycairoSurface_Type,               /* tp_base */
+    0, /* &PycairoSurface_Type, */      /* tp_base */
     0,                                  /* tp_dict */
     0,                                  /* tp_descr_get */
     0,                                  /* tp_descr_set */
@@ -615,7 +615,7 @@
     pdfsurface_methods,                 /* tp_methods */
     0,                                  /* tp_members */
     0,                                  /* tp_getset */
-    &PycairoSurface_Type,               /* tp_base */
+    0, /* &PycairoSurface_Type, */      /* tp_base */
     0,                                  /* tp_dict */
     0,                                  /* tp_descr_get */
     0,                                  /* tp_descr_set */
@@ -708,7 +708,7 @@
     pssurface_methods,                  /* tp_methods */
     0,                                  /* tp_members */
     0,                                  /* tp_getset */
-    &PycairoSurface_Type,               /* tp_base */
+    0, /* &PycairoSurface_Type, */      /* tp_base */
     0,                                  /* tp_dict */
     0,                                  /* tp_descr_get */
     0,                                  /* tp_descr_set */
@@ -786,7 +786,7 @@
     win32surface_methods,               /* tp_methods */
     0,                                  /* tp_members */
     0,                                  /* tp_getset */
-    &PycairoSurface_Type,               /* tp_base */
+    0, /* &PycairoSurface_Type, */      /* tp_base */
     0,                                  /* tp_dict */
     0,                                  /* tp_descr_get */
     0,                                  /* tp_descr_set */



More information about the cairo-commit mailing list