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

diff --git a/modules/misc/freetype.c b/modules/misc/freetype.c
index 2e17338f52103b6d1f748d4d9fe68310f7bcea28..8341cf04c883c80e8306541666feedc356d7296a 100644 (file)
--- a/modules/misc/freetype.c
+++ b/modules/misc/freetype.c
@@ -436,8 +436,12 @@ static int Create( vlc_object_t *p_this )
 # endif
 
 #else
-    p_sys->psz_fontfamily = strdup( DEFAULT_FONT )
+
+#ifdef HAVE_FONTCONFIG
+    p_sys->psz_fontfamily = strdup( DEFAULT_FONT );
     psz_fontfile = psz_fontfamily;
+#endif
+
 #endif
 
     i_error = FT_Init_FreeType( &p_sys->p_library );

diff --git a/modules/misc/text_renderer.h b/modules/misc/text_renderer.h
index d8835b053f579b268875c54a7adca5eafc3278b8..cddaab7127c59f54f1e342d52b799bfd4c49f055 100644 (file)
--- a/modules/misc/text_renderer.h
+++ b/modules/misc/text_renderer.h
@@ -542,6 +542,7 @@ static int ProcessNodes( filter_t *p_filter,
         if( p_font_style->i_style_flags & STYLE_UNDERLINE )
             b_uline = true;
     }
+#ifdef HAVE_FONTCONFIG
     else
     {
         rv = PushFont( &p_fonts,
@@ -551,6 +552,8 @@ static int ProcessNodes( filter_t *p_filter,
                           (((255-p_sys->i_font_opacity) & 0xff) << 24),
                        0x00ffffff );
     }
+#endif
+
     if( rv != VLC_SUCCESS )
         return rv;