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

Don't destroy a NULL font.

Browse source
This commit is contained in:
Carl Worth 2004-11-14 10:07:54 +00:00
parent 2b76ec2d46
commit 78f1206bf8
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2004-11-14 Carl Worth <cworth@cworth.org>
* src/cairo_gstate.c (_cairo_gstate_select_font): Don't destroy a
NULL font.
2004-11-13 Carl Worth <cworth@cworth.org>
* src/cairo_gstate.c (_cairo_gstate_select_font): Unconditionally

4
src/cairo-gstate.c
View file

@ -1992,10 +1992,10 @@ _cairo_gstate_select_font (cairo_gstate_t *gstate,
cairo_font_slant_t slant,
cairo_font_weight_t weight)
{
_cairo_unscaled_font_destroy (gstate->font);
if (gstate->font)
_cairo_unscaled_font_destroy (gstate->font);
gstate->font = _cairo_unscaled_font_create (family, slant, weight);
if (gstate->font == NULL)
return CAIRO_STATUS_NO_MEMORY;

4
src/cairo_gstate.c
View file

@ -1992,10 +1992,10 @@ _cairo_gstate_select_font (cairo_gstate_t *gstate,
cairo_font_slant_t slant,
cairo_font_weight_t weight)
{
_cairo_unscaled_font_destroy (gstate->font);
if (gstate->font)
_cairo_unscaled_font_destroy (gstate->font);
gstate->font = _cairo_unscaled_font_create (family, slant, weight);
if (gstate->font == NULL)
return CAIRO_STATUS_NO_MEMORY;