Commit 0c76db2e authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Freetype: fix Android miscompilation

parent 4e55554c
......@@ -1405,18 +1405,6 @@ static int Android_ParseFamily( filter_t *p_filter, xml_reader_t *p_xml )
return VLC_EGENERIC;
}
int Android_Prepare( filter_t *p_filter )
{
if( Android_ParseSystemFonts( p_filter, ANDROID_SYSTEM_FONTS ) == VLC_ENOMEM )
return VLC_EGENERIC;
if( Android_ParseSystemFonts( p_filter, ANDROID_FALLBACK_FONTS ) == VLC_ENOMEM )
return VLC_EGENERIC;
if( Android_ParseSystemFonts( p_filter, ANDROID_VENDOR_FONTS ) == VLC_ENOMEM )
return VLC_EGENERIC;
return VLC_SUCCESS;
}
static int Android_ParseSystemFonts( filter_t *p_filter, const char *psz_path )
{
int i_ret = VLC_SUCCESS;
......@@ -1449,6 +1437,18 @@ static int Android_ParseSystemFonts( filter_t *p_filter, const char *psz_path )
return i_ret;
}
int Android_Prepare( filter_t *p_filter )
{
if( Android_ParseSystemFonts( p_filter, ANDROID_SYSTEM_FONTS ) == VLC_ENOMEM )
return VLC_EGENERIC;
if( Android_ParseSystemFonts( p_filter, ANDROID_FALLBACK_FONTS ) == VLC_ENOMEM )
return VLC_EGENERIC;
if( Android_ParseSystemFonts( p_filter, ANDROID_VENDOR_FONTS ) == VLC_ENOMEM )
return VLC_EGENERIC;
return VLC_SUCCESS;
}
const vlc_family_t *Android_GetFamily( filter_t *p_filter, const char *psz_family )
{
filter_sys_t *p_sys = p_filter->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