diff options
Diffstat (limited to 'src/xine-engine/osd.c')
| -rw-r--r-- | src/xine-engine/osd.c | 35 |
1 files changed, 22 insertions, 13 deletions
diff --git a/src/xine-engine/osd.c b/src/xine-engine/osd.c index 1d3754d42..aaeb2538f 100644 --- a/src/xine-engine/osd.c +++ b/src/xine-engine/osd.c @@ -215,6 +215,20 @@ struct osd_ft2context_s { FT_Face face; int size; }; + +static void osd_free_ft2 (osd_object_t *osd) +{ + if( osd->ft2 ) { + if ( osd->ft2->face ) + FT_Done_Face (osd->ft2->face); + if ( osd->ft2->library ) + FT_Done_FreeType(osd->ft2->library); + free( osd->ft2 ); + osd->ft2 = NULL; + } +} +#else +static inline void osd_free_ft2 (osd_object_t *osd __attr_unused) {} #endif /* @@ -1032,6 +1046,11 @@ static int osd_set_font_freetype2( osd_object_t *osd, const char *fontname, int return 0; } } + + if (osd->ft2->face) { + FT_Done_Face (osd->ft2->face); + osd->ft2->face = NULL; + } do { /* while 0 */ #ifdef HAVE_FONTCONFIG @@ -1041,16 +1060,14 @@ static int osd_set_font_freetype2( osd_object_t *osd, const char *fontname, int if ( osd_lookup_xdg(osd, fontname) ) break; - free(osd->ft2); - osd->ft2 = NULL; + osd_free_ft2 (osd); return 0; } while(0); if (FT_Set_Pixel_Sizes(osd->ft2->face, 0, size)) { xprintf(osd->renderer->stream->xine, XINE_VERBOSITY_LOG, _("osd: error setting font size (no scalable font?)\n")); - free(osd->ft2); - osd->ft2 = NULL; + osd_free_ft2 (osd); return 0; } @@ -1626,15 +1643,7 @@ static void osd_free_object (osd_object_t *osd_to_close) { if ( osd == osd_to_close ) { free( osd->area ); -#ifdef HAVE_FT2 - if( osd->ft2 ) { - if ( osd->ft2->library ) - FT_Done_FreeType(osd->ft2->library); - - free( osd->ft2 ); - } -#endif - + osd_free_ft2 (osd); osd_free_encoding(osd); if( last ) |