vlc | branch: master | Felix Paul Kühne <[email protected]> | Tue Dec 1 14:07:53 2015 +0100| [aa1a73ef0c948bf856bccf3b2cd601e828acebab] | committer: Felix Paul Kühne
freetype: remote non-needed default list initialization for Darwin > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=aa1a73ef0c948bf856bccf3b2cd601e828acebab --- modules/text_renderer/freetype/freetype.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/modules/text_renderer/freetype/freetype.c b/modules/text_renderer/freetype/freetype.c index 040a691..3409460 100644 --- a/modules/text_renderer/freetype/freetype.c +++ b/modules/text_renderer/freetype/freetype.c @@ -44,7 +44,6 @@ /* apple stuff */ #ifdef __APPLE__ -# include <TargetConditionals.h> # undef HAVE_FONTCONFIG # define HAVE_GET_FONT_BY_FAMILY_NAME #endif @@ -1263,18 +1262,9 @@ static int Create( vlc_object_t *p_this ) p_sys->pf_get_fallbacks = FontConfig_GetFallbacks; FontConfig_Prepare( p_filter ); #elif defined( __APPLE__ ) -#if TARGET_OS_IPHONE - const char *const ppsz_darwin_default[] = - { "Helvetica Neue", "Arial", "Heiti SC", "Heiti TC", "Hiragino Mincho ProN", "Malayalam Sangam MN" }; -#else - const char *const ppsz_darwin_default[] = - { "Helvetica Neue", "Arial", "Heiti SC", "Heiti TC", "GungSeo", "Arial Unicode MS", "Malayalam Sangam MN" }; -#endif p_sys->pf_select = Generic_Select; p_sys->pf_get_family = CoreText_GetFamily; p_sys->pf_get_fallbacks = CoreText_GetFallbacks; - InitDefaultList( p_filter, ppsz_darwin_default, - sizeof( ppsz_darwin_default ) / sizeof( *ppsz_darwin_default ) ); #elif defined( _WIN32 ) && defined( HAVE_GET_FONT_BY_FAMILY_NAME ) const char *const ppsz_win32_default[] = { "Tahoma", "FangSong", "SimHei", "KaiTi" }; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
