diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 6 | ||||
| -rw-r--r-- | pango/pangoxft-render.c | 6 |
4 files changed, 20 insertions, 4 deletions
@@ -1,3 +1,9 @@ +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) + Thu Dec 2 15:47:44 2004 Owen Taylor <otaylor@redhat.com> * === Released 1.7.0 === diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 733ed367..c0773e14 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,9 @@ +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) + Thu Dec 2 15:47:44 2004 Owen Taylor <otaylor@redhat.com> * === Released 1.7.0 === diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 733ed367..c0773e14 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,9 @@ +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) + Thu Dec 2 15:47:44 2004 Owen Taylor <otaylor@redhat.com> * === Released 1.7.0 === 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; |