[vlc-commits] commit: fix freetype compilation for WIN32 without HAVE_FONTCONFIG ( Denis Charmet )
git at videolan.org
git at videolan.org
Thu Sep 30 22:45:25 CEST 2010
vlc/vlc-1.1 | branch: master | Denis Charmet <typx at dinauz.org> | Thu Sep 30 20:37:10 2010 +0200| [d76ee13e847568be808e2e5072c5852b51f1fd81] | committer: Rémi Duraffort
fix freetype compilation for WIN32 without HAVE_FONTCONFIG
Signed-off-by: Rémi Duraffort <ivoire at videolan.org>
(cherry picked from commit 37a4eca2752150fbcdd0b760a55a6b29557f1ec8)
Signed-off-by: Rémi Duraffort <ivoire at videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=d76ee13e847568be808e2e5072c5852b51f1fd81
---
modules/misc/freetype.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/modules/misc/freetype.c b/modules/misc/freetype.c
index cff07a6..8f80110 100644
--- a/modules/misc/freetype.c
+++ b/modules/misc/freetype.c
@@ -480,12 +480,12 @@ error:
#ifdef HAVE_FONTCONFIG
if( fontmatch ) FcPatternDestroy( fontmatch );
if( fontpattern ) FcPatternDestroy( fontpattern );
-#endif
#ifdef WIN32
if( p_dialog )
dialog_ProgressDestroy( p_dialog );
#endif
+#endif
if( p_sys->p_face ) FT_Done_Face( p_sys->p_face );
if( p_sys->p_library ) FT_Done_FreeType( p_sys->p_library );
More information about the vlc-commits
mailing list