diff options
| author | Behdad Esfahbod <behdad@gnome.org> | 2009-01-02 07:19:03 +0000 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@src.gnome.org> | 2009-01-02 07:19:03 +0000 |
| commit | 2317196c109647541c6339eac81db542bc0ca425 (patch) | |
| tree | dca0834734a783952b875fc3b0513fbf6b070901 | |
| parent | 50d61fa3b2f74758be0ee234861c4ad20f2d2294 (diff) | |
| download | pango-2317196c109647541c6339eac81db542bc0ca425.tar.gz | |
Finalize FreeType library after finalizing the FC fontmap. Fixes segfault
2009-01-02 Behdad Esfahbod <behdad@gnome.org>
* pango/pangocairo-fcfontmap.c (pango_cairo_fc_font_map_finalize):
* pango/pangoft2-fontmap.c (pango_ft2_font_map_finalize):
Finalize FreeType library after finalizing the FC fontmap. Fixes
segfault in the PangoFT2FontMap's finalize.
svn path=/trunk/; revision=2775
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | pango/pangocairo-fcfontmap.c | 4 | ||||
| -rw-r--r-- | pango/pangoft2-fontmap.c | 4 |
3 files changed, 11 insertions, 4 deletions
@@ -1,5 +1,12 @@ 2009-01-02 Behdad Esfahbod <behdad@gnome.org> + * pango/pangocairo-fcfontmap.c (pango_cairo_fc_font_map_finalize): + * pango/pangoft2-fontmap.c (pango_ft2_font_map_finalize): + Finalize FreeType library after finalizing the FC fontmap. Fixes + segfault in the PangoFT2FontMap's finalize. + +2009-01-02 Behdad Esfahbod <behdad@gnome.org> + * pango/pango-context.c (shaper_font_element_destroy), (get_shaper_font_cache), (shaper_font_cache_insert), (get_shaper_and_font_foreach), (itemize_state_process_run): diff --git a/pango/pangocairo-fcfontmap.c b/pango/pangocairo-fcfontmap.c index ee6af537..33e94549 100644 --- a/pango/pangocairo-fcfontmap.c +++ b/pango/pangocairo-fcfontmap.c @@ -74,9 +74,9 @@ pango_cairo_fc_font_map_finalize (GObject *object) { PangoCairoFcFontMap *cffontmap = (PangoCairoFcFontMap *) (object); - FT_Done_FreeType (cffontmap->library); - G_OBJECT_CLASS (pango_cairo_fc_font_map_parent_class)->finalize (object); + + FT_Done_FreeType (cffontmap->library); } static void diff --git a/pango/pangoft2-fontmap.c b/pango/pangoft2-fontmap.c index 2dc13c37..3da0f165 100644 --- a/pango/pangoft2-fontmap.c +++ b/pango/pangoft2-fontmap.c @@ -102,9 +102,9 @@ pango_ft2_font_map_finalize (GObject *object) if (ft2fontmap->substitute_destroy) ft2fontmap->substitute_destroy (ft2fontmap->substitute_data); - FT_Done_FreeType (ft2fontmap->library); - G_OBJECT_CLASS (pango_ft2_font_map_parent_class)->finalize (object); + + FT_Done_FreeType (ft2fontmap->library); } /** |