[cairo-commit] cairo/src cairo-gstate.c,1.158,1.159

[Carl Worth]

Committed by: cworth

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

Modified Files:
	cairo-gstate.c 
Log Message:

2005-08-06  Carl Worth  <cworth at cworth.org>

        * BUGS: Remove several bugs that have been fixed.

        * ROADMAP: Slip group support off of the 1.0 roadmap. Update
        status of clipping work which otaylor is working on.

        * TODO: Update for progress on cairo_surface_mark_dirty
        (committed), non-antialiased rendering (patch), cairo_arc_to
        (patch), consistent error handling (committed), cairo_content_t
        (committed). Remove details for some completed items.

        * src/cairo-gstate.c (_cairo_gstate_set_font_face): Don't crash if
        font_face is NULL, (this is a documented mechanism for returning
        to the default font_face).


Index: cairo-gstate.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-gstate.c,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -d -r1.158 -r1.159
--- cairo-gstate.c	6 Aug 2005 04:33:42 -0000	1.158
+++ cairo-gstate.c	6 Aug 2005 23:57:14 -0000	1.159
@@ -1649,7 +1649,7 @@
 _cairo_gstate_set_font_face (cairo_gstate_t    *gstate, 
 			     cairo_font_face_t *font_face)
 {
-    if (font_face->status)
+    if (font_face && font_face->status)
 	return font_face->status;
     
     if (font_face != gstate->font_face) {