diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ChangeLog.pre-1-10 | 5 | ||||
-rw-r--r-- | ChangeLog.pre-1-2 | 5 | ||||
-rw-r--r-- | ChangeLog.pre-1-4 | 5 | ||||
-rw-r--r-- | ChangeLog.pre-1-6 | 5 | ||||
-rw-r--r-- | ChangeLog.pre-1-8 | 5 | ||||
-rw-r--r-- | pango/pangoft2-fontmap.c | 12 |
7 files changed, 39 insertions, 3 deletions
@@ -1,3 +1,8 @@ +2002-03-26 Alex Larsson <alexl@redhat.com> + + * pango/pangoft2-fontmap.c (pango_ft2_font_map_load_font): + Free pattern after using it. + 2002-03-26 Sven Neumann <sven@gimp.org> * pango/pangoft2-private.h diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index c63b660f..9863806c 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,8 @@ +2002-03-26 Alex Larsson <alexl@redhat.com> + + * pango/pangoft2-fontmap.c (pango_ft2_font_map_load_font): + Free pattern after using it. + 2002-03-26 Sven Neumann <sven@gimp.org> * pango/pangoft2-private.h diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index c63b660f..9863806c 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,8 @@ +2002-03-26 Alex Larsson <alexl@redhat.com> + + * pango/pangoft2-fontmap.c (pango_ft2_font_map_load_font): + Free pattern after using it. + 2002-03-26 Sven Neumann <sven@gimp.org> * pango/pangoft2-private.h diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index c63b660f..9863806c 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,8 @@ +2002-03-26 Alex Larsson <alexl@redhat.com> + + * pango/pangoft2-fontmap.c (pango_ft2_font_map_load_font): + Free pattern after using it. + 2002-03-26 Sven Neumann <sven@gimp.org> * pango/pangoft2-private.h diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index c63b660f..9863806c 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,8 @@ +2002-03-26 Alex Larsson <alexl@redhat.com> + + * pango/pangoft2-fontmap.c (pango_ft2_font_map_load_font): + Free pattern after using it. + 2002-03-26 Sven Neumann <sven@gimp.org> * pango/pangoft2-private.h diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index c63b660f..9863806c 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,8 @@ +2002-03-26 Alex Larsson <alexl@redhat.com> + + * pango/pangoft2-fontmap.c (pango_ft2_font_map_load_font): + Free pattern after using it. + 2002-03-26 Sven Neumann <sven@gimp.org> * pango/pangoft2-private.h diff --git a/pango/pangoft2-fontmap.c b/pango/pangoft2-fontmap.c index c0077f1e..da1a7b0d 100644 --- a/pango/pangoft2-fontmap.c +++ b/pango/pangoft2-fontmap.c @@ -519,17 +519,23 @@ pango_ft2_font_map_load_font (PangoFontMap *fontmap, { MiniXftPattern *pattern, *match; MiniXftResult res; - + PangoFont *font; + pattern = pango_ft2_make_pattern (description); match = MiniXftFontMatch ((Display *)1, 0, pattern, &res); MiniXftPatternDestroy (pattern); + + font = NULL; if (match) - return pango_ft2_font_map_new_font (fontmap, match); + { + font = pango_ft2_font_map_new_font (fontmap, match); + MiniXftPatternDestroy (match); + } - return NULL; + return font; } static PangoFontset * |