summaryrefslogtreecommitdiff
path: root/pango
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@gnome.org>2006-02-08 01:43:59 +0000
committerBehdad Esfahbod <behdad@src.gnome.org>2006-02-08 01:43:59 +0000
commit511b8ed5a686a49c5d0801e33ab240cc89cfb9f2 (patch)
tree9c518556dbcb4b7b6eb05ab6a1f8eaea16d463bd /pango
parente5d3dda3587222c7bbe43da45151ec17bbdb88e5 (diff)
downloadpango-511b8ed5a686a49c5d0801e33ab240cc89cfb9f2.tar.gz
Bug 330289 – Fix build with gcc 2.95 (pangox.c)
2006-02-07 Behdad Esfahbod <behdad@gnome.org> Bug 330289 – Fix build with gcc 2.95 (pangox.c) * pango/pangox.c (get_subfonts_foreach): Fixed.
Diffstat (limited to 'pango')
-rw-r--r--pango/pangox.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/pango/pangox.c b/pango/pangox.c
index f5fb7dc7..d382df0c 100644
--- a/pango/pangox.c
+++ b/pango/pangox.c
@@ -876,18 +876,21 @@ get_subfonts_foreach (PangoFont *font,
{
GSList **subfonts = data;
PangoGlyph glyph = glyph_info->glyph;
+ PangoXSubfont subfont;
if (glyph == PANGO_GLYPH_EMPTY)
return;
/* Use an arbitrary subfont for unknown glyphs...*/
if (glyph & PANGO_GLYPH_UNKNOWN_FLAG)
+ {
if (((PangoXFont *)font)->n_subfonts > 0)
glyph = PANGO_X_MAKE_GLYPH (1, 0);
else
return;
+ }
- PangoXSubfont subfont = PANGO_X_GLYPH_SUBFONT (glyph);
+ subfont = PANGO_X_GLYPH_SUBFONT (glyph);
if (!g_slist_find (*subfonts, GUINT_TO_POINTER ((guint)subfont)))
*subfonts = g_slist_prepend (*subfonts, GUINT_TO_POINTER ((guint)subfont));
}