[cairo-commit] cairo/src cairo_gstate.c,1.73,1.74

[Owen Taylor]

Committed by: otaylor

Update of /cvs/cairo/cairo/src
In directory gabe:/tmp/cvs-serv9049/src

Modified Files:
	cairo_gstate.c 
Log Message:
2005-01-21  Owen Taylor  <otaylor at redhat.com>

        * Call _cairo_gstate_ensure_font(). Don't reference
        the returned font.


Index: cairo_gstate.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo_gstate.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- cairo_gstate.c	21 Jan 2005 22:33:48 -0000	1.73
+++ cairo_gstate.c	21 Jan 2005 23:43:55 -0000	1.74
@@ -2215,10 +2215,14 @@
 
 
 cairo_status_t
-_cairo_gstate_current_font (cairo_gstate_t *gstate, 			    cairo_font_t **font)
+_cairo_gstate_current_font (cairo_gstate_t *gstate,
+ 			    cairo_font_t  **font)
 {
+    status = _cairo_gstate_ensure_font (gstate);
+    if (status)
+	return status;
+    
     *font = gstate->font;
-    cairo_font_reference (*font);
 
     return CAIRO_STATUS_SUCCESS;
 }