Skip to content

V
vlc
Commit bb2d1cb5 authored by Francois Cartegnie's avatar Francois Cartegnie
Browse files
Options

freetype: always merge style with local one

parent a1a22422
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
modules/text_renderer/freetype.c
View file @ bb2d1cb5
...@@ -980,12 +980,11 @@ static uni_char_t* SegmentsToTextAndStyles( filter_t *p_filter, const text_segme ...@@ -980,12 +980,11 @@ static uni_char_t* SegmentsToTextAndStyles( filter_t *p_filter, const text_segme
} }
if( s->style ) if( s->style )
{
/* Replace defaults with segment values */ /* Replace defaults with segment values */
text_style_Merge( p_style, s->style, true ); text_style_Merge( p_style, s->style, true );
/* Overwrite any default or value with forced ones */ /* Overwrite any default or value with forced ones */
text_style_Merge( p_style, p_filter->p_sys->p_forced_style, true ); 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 // 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 ) for ( size_t i = 0; i < i_string_bytes / sizeof( *psz_uni ); ++i )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment