[vlc-devel] commit: freetype: On Win32 (no fontconfig), correct compilation problems ( Erwan Tulou )

[git version control]

vlc | branch: master | Erwan Tulou <erwan10 at videolan.org> | Sat Aug 22 17:01:54 2009 +0200| [5a9ba0a5c9aea63090a871404bfb15122b50d16e] | committer: Erwan Tulou 

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

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5a9ba0a5c9aea63090a871404bfb15122b50d16e
---

 modules/misc/freetype.c      |    6 +++++-
 modules/misc/text_renderer.h |    3 +++
 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/modules/misc/freetype.c b/modules/misc/freetype.c
index 2e17338..8341cf0 100644
--- a/modules/misc/freetype.c
+++ b/modules/misc/freetype.c
@@ -436,10 +436,14 @@ 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 );
     if( i_error )
     {
diff --git a/modules/misc/text_renderer.h b/modules/misc/text_renderer.h
index d8835b0..cddaab7 100644
--- 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;