diff options
| author | Owen Taylor <otaylor@redhat.com> | 2002-12-03 06:43:11 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-12-03 06:43:11 +0000 |
| commit | 317820c5e096d47b1ad9d7d1b004a895093b0098 (patch) | |
| tree | fb4cae2b9f7ee6acaa7b7616d89999b083198a52 /pango | |
| parent | 891b984fc26e0f2422a6c5c13d5b310dc7c2f7e9 (diff) | |
| download | pango-317820c5e096d47b1ad9d7d1b004a895093b0098.tar.gz | |
=== Released 1.1.4 ===
Mon Dec 2 17:22:34 2002 Owen Taylor <otaylor@redhat.com>
* === Released 1.1.4 ===
* configure.in: Up version to 1.1.4, interface age 0.
* NEWS: Updated.
* pango/pangoxft-fontmap.c (pango_fc_do_finalize)
* pango/pangoft2-fontmap.c (pango_fc_do_finalize): Fix
leaks of fontmap->substitute_data. (#99850)
* pango/Makefile.am (INCLUDES): Fix accidental reference
to pango-script-table.h.
Diffstat (limited to 'pango')
| -rw-r--r-- | pango/Makefile.am | 1 | ||||
| -rw-r--r-- | pango/pangoft2-fontmap.c | 3 | ||||
| -rw-r--r-- | pango/pangoxft-fontmap.c | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/pango/Makefile.am b/pango/Makefile.am index cc7ef4ec..27183dd2 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -138,7 +138,6 @@ libpango_1_0_la_SOURCES = \ pango-item.c \ pango-layout.c \ pango-markup.c \ - pango-script-table.h \ pango-tabs.c \ pango-utils.c \ reorder-items.c \ diff --git a/pango/pangoft2-fontmap.c b/pango/pangoft2-fontmap.c index 5edb890b..bcbdf438 100644 --- a/pango/pangoft2-fontmap.c +++ b/pango/pangoft2-fontmap.c @@ -326,6 +326,9 @@ _pango_ft2_font_map_get_library (PangoFontMap *fontmap) static void pango_fc_do_finalize (PangoFT2FontMap *fontmap) { + if (fontmap->substitute_destroy) + fontmap->substitute_destroy (fontmap->substitute_data); + FT_Done_FreeType (fontmap->library); } diff --git a/pango/pangoxft-fontmap.c b/pango/pangoxft-fontmap.c index 9e3f0ca5..e8dd78f0 100644 --- a/pango/pangoxft-fontmap.c +++ b/pango/pangoxft-fontmap.c @@ -357,6 +357,8 @@ pango_xft_get_context (Display *display, static void pango_fc_do_finalize (PangoXftFontMap *fontmap) { + if (fontmap->substitute_destroy) + fontmap->substitute_destroy (fontmap->substitute_data); } static void |