diff options
| author | Owen Taylor <otaylor@redhat.com> | 2004-06-21 15:37:21 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2004-06-21 15:37:21 +0000 |
| commit | 2cdd74591a2b885dbc31292d20dabba81d42faf0 (patch) | |
| tree | 0af9be1b1f694a6ce6c10a2554ef29ab4f34440d /pango/pangoft2-fontmap.c | |
| parent | ffc0b21393fcfb8be247afe7ad32291ab4431d4a (diff) | |
| download | pango-2cdd74591a2b885dbc31292d20dabba81d42faf0.tar.gz | |
Revert the last change, assert that initialization succeeded.
Mon Jun 21 11:35:29 2004 Owen Taylor <otaylor@redhat.com>
* pango/pangoft2-fontmap.c (pango_ft2_font_map_new):
Revert the last change, assert that initialization
succeeded.
Diffstat (limited to 'pango/pangoft2-fontmap.c')
| -rw-r--r-- | pango/pangoft2-fontmap.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/pango/pangoft2-fontmap.c b/pango/pangoft2-fontmap.c index 6bc1936c..4d4c7a57 100644 --- a/pango/pangoft2-fontmap.c +++ b/pango/pangoft2-fontmap.c @@ -136,8 +136,7 @@ pango_ft2_font_map_finalize (GObject *object) if (ft2fontmap->substitute_destroy) ft2fontmap->substitute_destroy (ft2fontmap->substitute_data); - if (ft2fontmap->library) - FT_Done_FreeType (ft2fontmap->library); + FT_Done_FreeType (ft2fontmap->library); parent_class->finalize (object); } @@ -169,12 +168,7 @@ pango_ft2_font_map_new (void) error = FT_Init_FreeType (&ft2fontmap->library); if (error != FT_Err_Ok) - { - g_warning ("Error from FT_Init_FreeType: %s", - _pango_ft2_ft_strerror (error)); - g_object_unref (ft2fontmap); - return NULL; - } + g_error ("pango_ft2_font_map_new: Could not initialize freetype"); return (PangoFontMap *)ft2fontmap; } |