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

Check font_face->status and return a nil scaled font if it is in an error state. (Thanks to Christian Biesinger and sunmoon1997 who pointed this out as part of bug #4674).

Browse source 
With this bug fix, the ft-font-create-for-ft-face test fails (as it should) since it is abusing fontconfig.
This commit is contained in:
Carl Worth 2006-01-20 14:48:07 +00:00
parent 074f886c00
commit 13511972b6
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
2006-01-20 Carl Worth <cworth@cworth.org>
* src/cairo-scaled-font.c: (cairo_scaled_font_create): Check
font_face->status and return a nil scaled font if it is in an
error state. (Thanks to Christian Biesinger and sunmoon1997 who
pointed this out as part of bug #4674).
With this bug fix, the ft-font-create-for-ft-face test fails (as
it should) since it is abusing fontconfig.
2006-01-19 Carl Worth <cworth@cworth.org>
* src/cairo-pdf.h:

5
src/cairo-scaled-font.c
View file

@ -1,4 +1,4 @@
/* $Id: cairo-scaled-font.c,v 1.9 2005-12-16 11:02:35 biesi Exp $
/* $Id: cairo-scaled-font.c,v 1.10 2006-01-20 22:48:07 cworth Exp $
*
* Copyright © 2005 Keith Packard
*
@ -405,6 +405,9 @@ cairo_scaled_font_create (cairo_font_face_t *font_face,
cairo_scaled_font_map_t *font_map;
cairo_scaled_font_t key, *scaled_font = NULL;
if (font_face->status)
return (cairo_scaled_font_t *)&_cairo_scaled_font_nil;
font_map = _cairo_scaled_font_map_lock ();
if (font_map == NULL)
goto UNWIND;