diff options
author | sleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2014-11-03 15:18:15 +0000 |
---|---|---|
committer | sleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2014-11-03 15:18:15 +0000 |
commit | 3a8c1d15a00799e6c9d6bb23ebe6b7382efed270 (patch) | |
tree | 3211a476a43e2c1131767ad3de70e9c1d870c25b /navit/font | |
parent | 8733e12a4c48a0f909434437406ee0a67a8cbc37 (diff) | |
download | navit-3a8c1d15a00799e6c9d6bb23ebe6b7382efed270.tar.gz |
Fix:font/freetype:Do not call FcFini on shutdown, it will assert() anyway.
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5922 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/font')
-rw-r--r-- | navit/font/freetype/font_freetype.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/navit/font/freetype/font_freetype.c b/navit/font/freetype/font_freetype.c index 50962fda9..e4453b592 100644 --- a/navit/font/freetype/font_freetype.c +++ b/navit/font/freetype/font_freetype.c @@ -782,14 +782,13 @@ font_freetype_glyph_get_glyph(struct font_freetype_glyph *g, static void font_freetype_destroy(void) { + // Do not call FcFini here: GdkPixbuf also (indirectly) uses fontconfig (for SVGs with + // text), but does not properly deallocate all objects, so FcFini assert()s. if (!library_deinit) { -#ifdef HAVE_FONTCONFIG - FcFini(); -#endif #if USE_CACHING - FTC_Manager_Done(manager); + FTC_Manager_Done(manager); #endif - FT_Done_FreeType(library); + FT_Done_FreeType(library); } library_deinit = 1; } |