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

diff --git a/modules/misc/freetype.c b/modules/misc/freetype.c
index 0ea7f3473a6469a29277837bb549c6e362b1af69..d63830dcf9eb6f934e323d1dfce28028c3e6a3a4 100644 (file)
--- a/modules/misc/freetype.c
+++ b/modules/misc/freetype.c
@@ -274,7 +274,6 @@ struct filter_sys_t
 
 #define UCHAR uint32_t
 #define TR_DEFAULT_FONT FC_DEFAULT_FONT
-#define TR_DEFAULT_COLOR 0x00ffffff
 #define TR_FONT_STYLE_PTR ft_style_t *
 
 #include "text_renderer.h"

diff --git a/modules/misc/quartztext.c b/modules/misc/quartztext.c
index 147ed3a432ea3552cda604cdea2acc2745fc6e4f..e0c6cb40e0f5d99369fcf4577ccffd87a5392408 100644 (file)
--- a/modules/misc/quartztext.c
+++ b/modules/misc/quartztext.c
@@ -156,7 +156,6 @@ struct filter_sys_t
 
 #define UCHAR UniChar
 #define TR_DEFAULT_FONT p_sys->psz_font_name
-#define TR_DEFAULT_COLOR p_sys->i_font_color
 #define TR_FONT_STYLE_PTR ATSUStyle
 
 #include "text_renderer.h"

diff --git a/modules/misc/text_renderer.h b/modules/misc/text_renderer.h
index fa5d098e63911ed94a857378879a10a0954a7acc..d8835b053f579b268875c54a7adca5eafc3278b8 100644 (file)
--- a/modules/misc/text_renderer.h
+++ b/modules/misc/text_renderer.h
@@ -547,7 +547,8 @@ static int ProcessNodes( filter_t *p_filter,
         rv = PushFont( &p_fonts,
                        TR_DEFAULT_FONT,
                        p_sys->i_font_size,
-                       TR_DEFAULT_COLOR,
+                       (p_sys->i_font_color & 0xffffff) |
+                          (((255-p_sys->i_font_opacity) & 0xff) << 24),
                        0x00ffffff );
     }
     if( rv != VLC_SUCCESS )