summaryrefslogtreecommitdiff
path: root/pango
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2004-12-10 21:40:17 +0000
committerOwen Taylor <otaylor@src.gnome.org>2004-12-10 21:40:17 +0000
commit93b027c3788b3bc71fb841b743b32c3717aa4398 (patch)
tree98db285089122ce395499d0f54c511d100d6e1e5 /pango
parentc4bf33e2d874731abbb921d38b22ef2748602b65 (diff)
downloadpango-93b027c3788b3bc71fb841b743b32c3717aa4398.tar.gz
Fix problem where the font would get unset after flushing at MAX_GLYPHS.
Fri Dec 10 16:30:40 2004 Owen Taylor <otaylor@redhat.com> * pango/pangoxft-render.c (draw_glyph): Fix problem where the font would get unset after flushing at MAX_GLYPHS. (#160978)
Diffstat (limited to 'pango')
-rw-r--r--pango/pangoxft-render.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/pango/pangoxft-render.c b/pango/pangoxft-render.c
index 44d15ddb..b3647a1f 100644
--- a/pango/pangoxft-render.c
+++ b/pango/pangoxft-render.c
@@ -240,16 +240,14 @@ draw_glyph (PangoRenderer *renderer,
xftrenderer->priv->glyphs = g_array_new (FALSE, FALSE,
sizeof (XftGlyphSpec));
- if (xftrenderer->priv->glyph_font != font)
+ if (xftrenderer->priv->glyph_font != font ||
+ xftrenderer->priv->glyphs->len == MAX_GLYPHS)
{
flush_glyphs (xftrenderer);
xftrenderer->priv->glyph_font = g_object_ref (font);
}
- if (xftrenderer->priv->glyphs->len == MAX_GLYPHS)
- flush_glyphs (xftrenderer);
-
gs.x = pixel_x;
gs.y = pixel_y;
gs.glyph = glyph;