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

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

Browse source
This commit is contained in:
Owen Taylor 2005-01-21 15:43:55 +00:00
parent e613961f94
commit 7275be538b
3 changed files with 17 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 @@
2005-01-21 Owen Taylor <otaylor@redhat.com>
* Call _cairo_gstate_ensure_font(). Don't reference
the returned font.
2005-01-21 Owen Taylor <otaylor@redhat.com>
* src/cairo_ft_font.c (_get_load_flags): Make dependence

8
src/cairo-gstate.c
View file

@ -2215,10 +2215,14 @@ _cairo_gstate_transform_font (cairo_gstate_t *gstate,
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;
}

8
src/cairo_gstate.c
View file

@ -2215,10 +2215,14 @@ _cairo_gstate_transform_font (cairo_gstate_t *gstate,
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;
}