2006-05-29 Matthew Allum <mallum@openedhand.com>

        * clutter/clutter-color.c: (clutter_color_set):
        Fix bit shifts in clutter color setters.

diff --git a/ChangeLog b/ChangeLog
index cb87c31..37056d1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2006-05-29  Matthew Allum  <mallum@openedhand.com>
 
+       * clutter/clutter-color.c: (clutter_color_set):
+       Fix bit shifts in clutter color setters.
+
+2006-05-29  Matthew Allum  <mallum@openedhand.com>
+
        * clutter/clutter-element.c:
        * clutter/clutter-element.h:
        Add initial new element depth() getter and setter.

diff --git a/clutter/clutter-color.c b/clutter/clutter-color.c
index f2bc38e..7b29e6e 100644 (file)
--- a/clutter/clutter-color.c
+++ b/clutter/clutter-color.c
@@ -28,7 +28,7 @@
 ClutterColor
 clutter_color_new (guint8 r, guint8 g, guint8 b, guint8 a)
 {
-  return ( r | g << 8 | b << 16 | a << 24 );
+  return ( a | b << 8 | g << 16  | r << 24 );
 }
 
 void
@@ -38,7 +38,7 @@ clutter_color_set (ClutterColor *color,
                   guint8        b, 
                   guint8        a)
 {
-  *color = ( r | g << 8 | b << 16 | a << 24 );
+  *color = ( a | b << 8 | g << 16  | r << 24 );
 }
 
 void