Browse Source

freetype: handle the UWP specific MakeFilePath in win32

The code is similar, apart from the Fully Qualified Name (FQN) support.
But such a path would fail in UWP anyway. It's not handled on desktop
Window either.
pull/162/head
Steve Lhomme 3 years ago
parent
commit
c45966965f
  1. 5
      modules/text_renderer/freetype/fonts/win32.c
  2. 2
      modules/text_renderer/freetype/platform_fonts.c

5
modules/text_renderer/freetype/fonts/win32.c

@ -683,6 +683,9 @@ done:
*pp_result = p_family;
return i_ret;
}
#else // !WINAPI_PARTITION_DESKTOP
#define GetWindowsFontPath() (NULL)
#endif // !WINAPI_PARTITION_DESKTOP
char * MakeFilePath( vlc_font_select_t *fs, const char *psz_filename )
{
@ -706,5 +709,3 @@ char * MakeFilePath( vlc_font_select_t *fs, const char *psz_filename )
return psz_filepath;
}
#endif

2
modules/text_renderer/freetype/platform_fonts.c

@ -841,7 +841,7 @@ static int StaticMap_GetFamily( vlc_font_select_t *fs, const char *psz_lcname,
}
#endif
#if !defined(_WIN32) || defined(VLC_WINSTORE_APP)
#if !defined(_WIN32)
char * MakeFilePath( vlc_font_select_t *fs, const char *psz_filename )
{

Loading…
Cancel
Save