[vlc-commits] freetype: always merge style with local one

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Mon Aug 17 17:54:13 2015 +0200| [bb2d1cb5e16d00f0655de4b10f1d2b3386f30254] | committer: Francois Cartegnie

freetype: always merge style with local one

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

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

diff --git a/modules/text_renderer/freetype.c b/modules/text_renderer/freetype.c
index 91f48e8..3e7f9d9 100644
--- a/modules/text_renderer/freetype.c
+++ b/modules/text_renderer/freetype.c
@@ -980,12 +980,11 @@ static uni_char_t* SegmentsToTextAndStyles( filter_t *p_filter, const text_segme
         }
 
         if( s->style )
-        {
             /* Replace defaults with segment values */
             text_style_Merge( p_style, s->style, true );
-            /* Overwrite any default or value with forced ones */
-            text_style_Merge( p_style, p_filter->p_sys->p_forced_style, true );
-        }
+
+        /* Overwrite any default or value with forced ones */
+        text_style_Merge( p_style, p_filter->p_sys->p_forced_style, true );
 
         // i_string_bytes is a number of bytes, while here we're going to assign pointer by pointer
         for ( size_t i = 0; i < i_string_bytes / sizeof( *psz_uni ); ++i )