Skip to content

V
vlc-2-2
Commit 7b6b6bf8 authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

Directly store alpha in font_stack_t::text_style_t (freetype).

parent e32bee08
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
modules/misc/text_renderer/freetype.c
View file @ 7b6b6bf8
...@@ -623,7 +623,7 @@ static int RenderYUVP( filter_t *p_filter, subpicture_region_t *p_region, ...@@ -623,7 +623,7 @@ static int RenderYUVP( filter_t *p_filter, subpicture_region_t *p_region,
/* Calculate text color components /* Calculate text color components
* Only use the first color */ * Only use the first color */
int i_alpha = 0xff - ((p_line->p_character[0].i_color >> 24) & 0xff); int i_alpha = (p_line->p_character[0].i_color >> 24) & 0xff;
YUVFromRGB( p_line->p_character[0].i_color, &i_y, &i_u, &i_v ); YUVFromRGB( p_line->p_character[0].i_color, &i_y, &i_u, &i_v );
/* Build palette */ /* Build palette */
...@@ -846,7 +846,7 @@ static int RenderYUVA( filter_t *p_filter, ...@@ -846,7 +846,7 @@ static int RenderYUVA( filter_t *p_filter,
continue; continue;
uint32_t i_color = ch->i_color; uint32_t i_color = ch->i_color;
i_a = 0xff - ((i_color >> 24) & 0xff); i_a = (i_color >> 24) & 0xff;
if( g == 0 ) if( g == 0 )
{ {
i_a = i_a * p_sys->i_outline_opacity / 255; i_a = i_a * p_sys->i_outline_opacity / 255;
...@@ -1160,7 +1160,7 @@ static int HandleFontAttributes( xml_reader_t *p_xml_reader, ...@@ -1160,7 +1160,7 @@ static int HandleFontAttributes( xml_reader_t *p_xml_reader,
int rv; int rv;
char *psz_fontname = NULL; char *psz_fontname = NULL;
uint32_t i_font_color = 0xffffff; uint32_t i_font_color = 0xffffff;
int i_font_alpha = 0; int i_font_alpha = 255;
uint32_t i_karaoke_bg_color = 0x00ffffff; uint32_t i_karaoke_bg_color = 0x00ffffff;
int i_font_size = 24; int i_font_size = 24;
...@@ -1365,7 +1365,7 @@ static int ProcessNodes( filter_t *p_filter, ...@@ -1365,7 +1365,7 @@ static int ProcessNodes( filter_t *p_filter,
p_sys->psz_fontfamily, p_sys->psz_fontfamily,
p_sys->i_font_size, p_sys->i_font_size,
(p_sys->i_font_color & 0xffffff) | (p_sys->i_font_color & 0xffffff) |
(((255-p_sys->i_font_opacity) & 0xff) << 24), ((p_sys->i_font_opacity & 0xff) << 24),
0x00ffffff ); 0x00ffffff );
} }
#endif #endif
...@@ -2206,7 +2206,7 @@ static int RenderCommon( filter_t *p_filter, subpicture_region_t *p_region_out, ...@@ -2206,7 +2206,7 @@ static int RenderCommon( filter_t *p_filter, subpicture_region_t *p_region_out,
p_style = CreateStyle( p_sys->psz_fontfamily, p_style = CreateStyle( p_sys->psz_fontfamily,
p_sys->i_font_size, p_sys->i_font_size,
(p_sys->i_font_color & 0xffffff) | (p_sys->i_font_color & 0xffffff) |
(((255-p_sys->i_font_opacity) & 0xff) << 24), ((p_sys->i_font_opacity & 0xff) << 24),
0x00ffffff, 0); 0x00ffffff, 0);
i_text_length = SetupText( p_filter, i_text_length = SetupText( p_filter,
......
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