[vlc-commits] freetype: reorder font priorities

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Mon Aug 17 17:49:04 2015 +0200| [e225681c91cc858f4e61d33496bded50d28d131e] | committer: Francois Cartegnie

freetype: reorder font priorities

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

 modules/text_renderer/freetype.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/text_renderer/freetype.c b/modules/text_renderer/freetype.c
index ca06368..b159a1d 100644
--- a/modules/text_renderer/freetype.c
+++ b/modules/text_renderer/freetype.c
@@ -314,9 +314,13 @@ static int GetFontSize( filter_t *p_filter )
     filter_sys_t *p_sys = p_filter->p_sys;
     int           i_size = 0;
 
-    if( p_sys->p_default_style->i_font_size )
+    if( p_sys->p_forced_style->i_font_size )
     {
-        i_size = p_sys->p_default_style->i_font_size;
+        i_size = p_sys->p_forced_style->i_font_size;
+    }
+    else if( p_sys->p_forced_style->f_font_relsize )
+    {
+        i_size = (int) p_filter->fmt_out.video.i_height * p_sys->p_forced_style->f_font_relsize;
     }
     else if( p_sys->p_default_style->f_font_relsize )
     {