[vlc-commits] freetype: recompute font size before merging segments style

[Francois Cartegnie]

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

freetype: recompute font size before merging segments style

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

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

diff --git a/modules/text_renderer/freetype.c b/modules/text_renderer/freetype.c
index b159a1d..91f48e8 100644
--- a/modules/text_renderer/freetype.c
+++ b/modules/text_renderer/freetype.c
@@ -1011,6 +1011,9 @@ static int Render( filter_t *p_filter, subpicture_region_t *p_region_out,
     if( !p_region_in )
         return VLC_EGENERIC;
 
+    /* Reset the default fontsize in case screen metrics have changed */
+    p_filter->p_sys->p_style->i_font_size = GetFontSize( p_filter );
+
     const text_style_t **pp_styles = NULL;
     size_t i_text_length = 0;
     uni_char_t *psz_text = SegmentsToTextAndStyles( p_filter, p_region_in->p_text, &i_text_length, &pp_styles );
@@ -1019,9 +1022,6 @@ static int Render( filter_t *p_filter, subpicture_region_t *p_region_out,
         return VLC_EGENERIC;
     }
 
-    /* Reset the default fontsize in case screen metrics have changed */
-    p_filter->p_sys->p_style->i_font_size = GetFontSize( p_filter );
-
     /* */
     int rv = VLC_SUCCESS;
     FT_BBox bbox;