fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-04-26 10:10:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix to return &_cairo_font_face_nil instead of NULL on error.

Browse source
This commit is contained in:
Carl Worth 2005-08-06 16:38:33 +00:00
parent 8c52b287f3
commit 2f1024f83f
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2005-08-06 Carl Worth <cworth@cworth.org>
* src/cairo.c (cairo_get_font_face): Fix to return
&_cairo_font_face_nil instead of NULL on error.
2005-08-06 Jeff Muizelaar <jeff@infidigm.net>
* test/a8-mask.c: (main): Give reason for failure.

7
src/cairo.c
View file

@ -1687,16 +1687,13 @@ cairo_get_font_face (cairo_t *cr)
if (cr->status) {
_cairo_set_error (cr, cr->status);
return NULL;
return (cairo_font_face_t*) &_cairo_font_face_nil;
}
cr->status = _cairo_gstate_get_font_face (cr->gstate, &font_face);
if (cr->status) {
_cairo_set_error (cr, cr->status);
/* XXX: When available:
return _cairo_font_face_nil;
*/
return NULL;
return (cairo_font_face_t*) &_cairo_font_face_nil;
}
return font_face;