Commit 5a9ba0a5 authored by Erwan Tulou's avatar Erwan Tulou

freetype: On Win32 (no fontconfig), correct compilation problems

parent 96998812
...@@ -436,8 +436,12 @@ static int Create( vlc_object_t *p_this ) ...@@ -436,8 +436,12 @@ static int Create( vlc_object_t *p_this )
# endif # endif
#else #else
p_sys->psz_fontfamily = strdup( DEFAULT_FONT )
#ifdef HAVE_FONTCONFIG
p_sys->psz_fontfamily = strdup( DEFAULT_FONT );
psz_fontfile = psz_fontfamily; psz_fontfile = psz_fontfamily;
#endif
#endif #endif
i_error = FT_Init_FreeType( &p_sys->p_library ); i_error = FT_Init_FreeType( &p_sys->p_library );
......
...@@ -542,6 +542,7 @@ static int ProcessNodes( filter_t *p_filter, ...@@ -542,6 +542,7 @@ static int ProcessNodes( filter_t *p_filter,
if( p_font_style->i_style_flags & STYLE_UNDERLINE ) if( p_font_style->i_style_flags & STYLE_UNDERLINE )
b_uline = true; b_uline = true;
} }
#ifdef HAVE_FONTCONFIG
else else
{ {
rv = PushFont( &p_fonts, rv = PushFont( &p_fonts,
...@@ -551,6 +552,8 @@ static int ProcessNodes( filter_t *p_filter, ...@@ -551,6 +552,8 @@ static int ProcessNodes( filter_t *p_filter,
(((255-p_sys->i_font_opacity) & 0xff) << 24), (((255-p_sys->i_font_opacity) & 0xff) << 24),
0x00ffffff ); 0x00ffffff );
} }
#endif
if( rv != VLC_SUCCESS ) if( rv != VLC_SUCCESS )
return rv; return rv;
......
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