Commit f20218fa authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files

Split Freetype destruction from the main destruction


Signed-off-by: Jean-Baptiste Kempf's avatarJean-Baptiste Kempf <jb@videolan.org>
parent 634111a2
......@@ -2402,6 +2402,18 @@ error:
return VLC_EGENERIC;
}
static void Destroy_FT( vlc_object_t *p_this )
{
filter_t *p_filter = (filter_t *)p_this;
filter_sys_t *p_sys = p_filter->p_sys;
if( p_sys->p_stroker )
FT_Stroker_Done( p_sys->p_stroker );
FT_Done_Face( p_sys->p_face );
FT_Done_FreeType( p_sys->p_library );
}
/*****************************************************************************
* Destroy: destroy Clone video thread output method
*****************************************************************************
......@@ -2428,13 +2440,6 @@ static void Destroy( vlc_object_t *p_this )
free( p_sys->psz_win_fonts_path );
#endif
/* FcFini asserts calling the subfunction FcCacheFini()
* even if no other library functions have been made since FcInit(),
* so don't call it. */
if( p_sys->p_stroker )
FT_Stroker_Done( p_sys->p_stroker );
FT_Done_Face( p_sys->p_face );
FT_Done_FreeType( p_sys->p_library );
Destroy_FT( p_this );
free( p_sys );
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment