[Swfdec] libswfdec/swfdec_text_field_movie.c

[Benjamin Otte]

 libswfdec/swfdec_text_field_movie.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c04712319a4f7b0a2b8143e25c093d379e051ddd
Author: Benjamin Otte <otte at gnome.org>
Date:   Thu Nov 1 23:24:40 2007 +0100

    use SWFDEC_COLOR_COMBINE here, so changing the color format won't bite us

diff --git a/libswfdec/swfdec_text_field_movie.c b/libswfdec/swfdec_text_field_movie.c
index 979580e..e127971 100644
--- a/libswfdec/swfdec_text_field_movie.c
+++ b/libswfdec/swfdec_text_field_movie.c
@@ -594,7 +594,7 @@ swfdec_text_field_movie_render (SwfdecMovie *movie, cairo_t *cr,
     cairo_rectangle (cr, limit.x0, limit.y0, limit.x1 - limit.x0, limit.y1 - limit.y0);
     color = swfdec_color_apply_transform (text_movie->background_color, trans);
     // always use full alpha
-    swfdec_color_set_source (cr, (color & 0xffffff) + (255 << 24));
+    swfdec_color_set_source (cr, color | SWFDEC_COLOR_COMBINE (0, 0, 0, 255));
     cairo_fill (cr);
   }
 
@@ -606,7 +606,7 @@ swfdec_text_field_movie_render (SwfdecMovie *movie, cairo_t *cr,
 	SWFDEC_DOUBLE_TO_TWIPS (1));
     color = swfdec_color_apply_transform (text_movie->border_color, trans);
     // always use full alpha
-    swfdec_color_set_source (cr, (color & 0xffffff) + (255 << 24));
+    swfdec_color_set_source (cr, color | SWFDEC_COLOR_COMBINE (0, 0, 0, 255));
     cairo_set_line_width (cr, SWFDEC_DOUBLE_TO_TWIPS (1));
     cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
     cairo_set_antialias (cr, CAIRO_ANTIALIAS_NONE);