summaryrefslogtreecommitdiff
path: root/pango/modules.c
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2001-05-28 16:19:07 +0000
committerOwen Taylor <otaylor@src.gnome.org>2001-05-28 16:19:07 +0000
commit15fb6b491224924bb7aa2ff0c97152164dd023ae (patch)
tree1ea0a2ef446520bcbcebe7fbebe42cb5e0c84cb5 /pango/modules.c
parentca99d2147724fdb60b28f636eaa7ad89b902bd7a (diff)
downloadpango-15fb6b491224924bb7aa2ff0c97152164dd023ae.tar.gz
Fix problem with information loss when converting leaves to branches.
Mon May 28 11:51:45 2001 Owen Taylor <otaylor@redhat.com> * pango/modules.c (map_add_engine): Fix problem with information loss when converting leaves to branches. (Problem found by Toshio MARUYAMA) Wed May 23 12:59:26 2001 Owen Taylor <otaylor@redhat.com> * pango/pangox.c (pango_x_make_font_struct): Load the font struct for "fixed" in the case of a broken font list where fonts listed by XListFonts aren't loadable.
Diffstat (limited to 'pango/modules.c')
-rw-r--r--pango/modules.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/pango/modules.c b/pango/modules.c
index 7e5c7ec5..3b2daba1 100644
--- a/pango/modules.c
+++ b/pango/modules.c
@@ -437,13 +437,12 @@ map_add_engine (PangoMapInfo *info,
{
if (map->submaps[submap].is_leaf)
{
+ PangoMapEntry old_entry = map->submaps[submap].d.entry;
+
map->submaps[submap].is_leaf = FALSE;
map->submaps[submap].d.leaves = g_new (PangoMapEntry, 256);
for (j=0; j<256; j++)
- {
- map->submaps[submap].d.leaves[j].info = NULL;
- map->submaps[submap].d.leaves[j].is_exact = FALSE;
- }
+ map->submaps[submap].d.leaves[j] = old_entry;
}
for (j=start; j<=end; j++)