pango r2775 - in trunk: . pango

[behdad svn gnome org]

Author: behdad
Date: Fri Jan  2 07:19:03 2009
New Revision: 2775
URL: http://svn.gnome.org/viewvc/pango?rev=2775&view=rev

Log:
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.

Modified:
   trunk/ChangeLog
   trunk/pango/pangocairo-fcfontmap.c
   trunk/pango/pangoft2-fontmap.c

Modified: trunk/pango/pangocairo-fcfontmap.c
==============================================================================
--- trunk/pango/pangocairo-fcfontmap.c	(original)
+++ trunk/pango/pangocairo-fcfontmap.c	Fri Jan  2 07:19:03 2009
@@ -74,9 +74,9 @@
 {
   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

Modified: trunk/pango/pangoft2-fontmap.c
==============================================================================
--- trunk/pango/pangoft2-fontmap.c	(original)
+++ trunk/pango/pangoft2-fontmap.c	Fri Jan  2 07:19:03 2009
@@ -102,9 +102,9 @@
   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);
 }
 
 /**