diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 6 | ||||
| -rw-r--r-- | pango/pangofc-fontmap.c | 6 |
3 files changed, 15 insertions, 3 deletions
@@ -1,5 +1,11 @@ 2005-07-21 Owen Taylor <otaylor@redhat.com> + * pango/pangofc-fontmap.c (pango_fc_font_map_add): Fix an + excess copy. (pango_fc_font_map_get_patterns): Add back + a call to FcPatternDestroy() that got dropped somehow. + +2005-07-21 Owen Taylor <otaylor@redhat.com> + * modules/indic/indic-ot.c: Minor formatting tweak to license header. diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index a3bc8fa6..c8ba64d3 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,5 +1,11 @@ 2005-07-21 Owen Taylor <otaylor@redhat.com> + * pango/pangofc-fontmap.c (pango_fc_font_map_add): Fix an + excess copy. (pango_fc_font_map_get_patterns): Add back + a call to FcPatternDestroy() that got dropped somehow. + +2005-07-21 Owen Taylor <otaylor@redhat.com> + * modules/indic/indic-ot.c: Minor formatting tweak to license header. diff --git a/pango/pangofc-fontmap.c b/pango/pangofc-fontmap.c index d614e4e7..86387ae2 100644 --- a/pango/pangofc-fontmap.c +++ b/pango/pangofc-fontmap.c @@ -550,9 +550,7 @@ pango_fc_font_map_add (PangoFcFontMap *fcfontmap, fcfont->context_key = key_copy->context_key; fcfont->matrix = key.matrix; - g_hash_table_insert (priv->font_hash, - font_hash_key_copy (&key), - fcfont); + g_hash_table_insert (priv->font_hash, key_copy, fcfont); } static PangoFcFont * @@ -1124,6 +1122,8 @@ pango_fc_font_map_get_patterns (PangoFontMap *fontmap, } } + FcPatternDestroy (pattern); + FcFontSetSortDestroy (font_patterns); patterns->key = fontset_hash_key_copy (&key); |