[vlc-commits] freetype: segment style must merge with current, not default

Francois Cartegnie git at videolan.org
Mon Aug 17 17:59:41 CEST 2015


vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Mon Aug 17 17:56:08 2015 +0200| [ac8dbda8b2dd80f598bdb5a2e071a20b34a13d85] | committer: Francois Cartegnie

freetype: segment style must merge with current, not default

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

 modules/text_renderer/freetype.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/text_renderer/freetype.c b/modules/text_renderer/freetype.c
index 3e7f9d9..05b84f4 100644
--- a/modules/text_renderer/freetype.c
+++ b/modules/text_renderer/freetype.c
@@ -971,7 +971,7 @@ static uni_char_t* SegmentsToTextAndStyles( filter_t *p_filter, const text_segme
         }
         pp_styles = pp_styles_realloc;
         // We're actually writing to a read only object, something's wrong with the conception.
-        text_style_t *p_style = text_style_Duplicate( p_filter->p_sys->p_default_style );
+        text_style_t *p_style = text_style_Duplicate( p_filter->p_sys->p_style );
         if ( p_style == NULL )
         {
             free( pp_styles );



More information about the vlc-commits mailing list