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

[gl] Unthaw font along contended path.

Browse source 
If we bail after freezing the font, make sure we thaw that it is thawed
before returning.
This commit is contained in:
Chris Wilson 2009-07-28 13:24:43 +01:00
parent e19b2866ed
commit 21d50e2163
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/cairo-gl-glyphs.c
View file

@ -460,7 +460,7 @@ _cairo_gl_surface_show_glyphs (void *abstract_dst,
_cairo_scaled_font_freeze_cache (scaled_font);
if (! _cairo_gl_surface_owns_font (dst, scaled_font))
goto CLEANUP_CONTEXT;
goto CLEANUP_FONT;
if (scaled_font->surface_private == NULL) {
/* XXX couple into list to remove on context destruction */
@ -570,9 +570,9 @@ _cairo_gl_surface_show_glyphs (void *abstract_dst,
status = CAIRO_STATUS_SUCCESS;
FINISH:
_cairo_gl_flush_glyphs (ctx, &setup);
CLEANUP_FONT:
_cairo_scaled_font_thaw_cache (scaled_font);
CLEANUP_CONTEXT:
glDisable (GL_BLEND);
glDisable (GL_SCISSOR_TEST);