Commit e93b437d authored by Laurent Aimar's avatar Laurent Aimar

Fixed support for font color and opacity for html rendered text.

parent be3f9e2d
...@@ -274,7 +274,6 @@ struct filter_sys_t ...@@ -274,7 +274,6 @@ struct filter_sys_t
#define UCHAR uint32_t #define UCHAR uint32_t
#define TR_DEFAULT_FONT FC_DEFAULT_FONT #define TR_DEFAULT_FONT FC_DEFAULT_FONT
#define TR_DEFAULT_COLOR 0x00ffffff
#define TR_FONT_STYLE_PTR ft_style_t * #define TR_FONT_STYLE_PTR ft_style_t *
#include "text_renderer.h" #include "text_renderer.h"
......
...@@ -156,7 +156,6 @@ struct filter_sys_t ...@@ -156,7 +156,6 @@ struct filter_sys_t
#define UCHAR UniChar #define UCHAR UniChar
#define TR_DEFAULT_FONT p_sys->psz_font_name #define TR_DEFAULT_FONT p_sys->psz_font_name
#define TR_DEFAULT_COLOR p_sys->i_font_color
#define TR_FONT_STYLE_PTR ATSUStyle #define TR_FONT_STYLE_PTR ATSUStyle
#include "text_renderer.h" #include "text_renderer.h"
......
...@@ -547,7 +547,8 @@ static int ProcessNodes( filter_t *p_filter, ...@@ -547,7 +547,8 @@ static int ProcessNodes( filter_t *p_filter,
rv = PushFont( &p_fonts, rv = PushFont( &p_fonts,
TR_DEFAULT_FONT, TR_DEFAULT_FONT,
p_sys->i_font_size, p_sys->i_font_size,
TR_DEFAULT_COLOR, (p_sys->i_font_color & 0xffffff) |
(((255-p_sys->i_font_opacity) & 0xff) << 24),
0x00ffffff ); 0x00ffffff );
} }
if( rv != VLC_SUCCESS ) if( rv != VLC_SUCCESS )
......
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