[cairo-commit] pycairo/cairo pycairo-font.c,1.24,1.25

[Dave Beckett]

Committed by: dajobe

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

Modified Files:
	pycairo-font.c 
Log Message:
2005-07-29  Dave Beckett  <Dave.Beckett at bristol.ac.uk>

	* cairo/pycairo-surface.c (surface_finish): Do not use the
	cairo_surface_finish() return value to check for error status,
	instead use cairo_surface_status().

	* cairo/pycairo-font.c (scaled_font_extents): Do not use the
	cairo_scaled_font_extents() return value to check for error
	status, instead use cairo_scaled_font_status().


Index: pycairo-font.c
===================================================================
RCS file: /cvs/cairo/pycairo/cairo/pycairo-font.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- pycairo-font.c	23 Jul 2005 04:41:41 -0000	1.24
+++ pycairo-font.c	29 Jul 2005 22:03:39 -0000	1.25
@@ -210,8 +210,9 @@
 scaled_font_extents (PycairoScaledFont *o)
 {
     cairo_font_extents_t e;
-    cairo_status_t status = cairo_scaled_font_extents (o->scaled_font, &e);
-    if (Pycairo_Check_Status (status))
+
+    cairo_scaled_font_extents (o->scaled_font, &e);
+    if (Pycairo_Check_Status (cairo_scaled_font_status(o->scaled_font)))
 	return NULL;
     return Py_BuildValue ("(ddddd)", e.ascent, e.descent, e.height, 
 			  e.max_x_advance, e.max_y_advance);