From: Steinar H. Gunderson <steinar+vlc@gunderson.no>
Date: Thu, 30 Sep 2010 23:27:56 +0000 (+0200)
Subject: Merge branch 'master' of git://git.videolan.org/vlc
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=a695dfb6c3efa09be59778a8de46f5467ae92861;hp=c21f9fb09f669d1777b2a8b177c9a7068af4f147;p=vlc

Merge branch 'master' of git://git.videolan.org/vlc
---

diff --git a/modules/misc/freetype.c b/modules/misc/freetype.c
index 7d6c4f6b66..e39d8afe59 100644
--- a/modules/misc/freetype.c
+++ b/modules/misc/freetype.c
@@ -316,12 +316,12 @@ static int Create( vlc_object_t *p_this )
     var_Create( p_filter, "freetype-rel-fontsize",
                 VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
 
-    psz_fontfamily = var_CreateGetString( p_filter, "freetype-font" );
-    p_sys->i_default_font_size = var_CreateGetInteger( p_filter, "freetype-fontsize" );
-    p_sys->i_effect = var_CreateGetInteger( p_filter, "freetype-effect" );
-    p_sys->i_font_opacity = var_CreateGetInteger( p_filter,"freetype-opacity" );
+    psz_fontfamily = var_InheritString( p_filter, "freetype-font" );
+    p_sys->i_default_font_size = var_InheritInteger( p_filter, "freetype-fontsize" );
+    p_sys->i_effect = var_InheritInteger( p_filter, "freetype-effect" );
+    p_sys->i_font_opacity = var_InheritInteger( p_filter,"freetype-opacity" );
     p_sys->i_font_opacity = __MAX( __MIN( p_sys->i_font_opacity, 255 ), 0 );
-    p_sys->i_font_color = var_CreateGetInteger( p_filter, "freetype-color" );
+    p_sys->i_font_color = var_InheritInteger( p_filter, "freetype-color" );
     p_sys->i_font_color = __MAX( __MIN( p_sys->i_font_color , 0xFFFFFF ), 0 );
 
     fontindex=0;
@@ -479,11 +479,11 @@ 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 );