* clutter-gtk/gtk-clutter-util.c

	(gtk_clutter_texture_set_from_pixbuf)
	(gtk_clutter_texture_new_from_pixbuf): The bpp values were the
	wrong way around so these two functions always failed.

diff --git a/ChangeLog b/ChangeLog
index 98e1801..302a15b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-01  Neil Roberts  <neil@o-hand.com>
+
+       * clutter-gtk/gtk-clutter-util.c
+       (gtk_clutter_texture_set_from_pixbuf)
+       (gtk_clutter_texture_new_from_pixbuf): The bpp values were the
+       wrong way around so these two functions always failed.
+
 2008-07-31  Emmanuele Bassi  <ebassi@openedhand.com>
 
        * clutter-gtk/gtk-clutter-util.c:

diff --git a/clutter-gtk/gtk-clutter-util.c b/clutter-gtk/gtk-clutter-util.c
index 77f161e..952058e 100644 (file)
--- a/clutter-gtk/gtk-clutter-util.c
+++ b/clutter-gtk/gtk-clutter-util.c
@@ -182,7 +182,7 @@ gtk_clutter_texture_new_from_pixbuf (GdkPixbuf *pixbuf)
                                      gdk_pixbuf_get_width (pixbuf),
                                      gdk_pixbuf_get_height (pixbuf),
                                      gdk_pixbuf_get_rowstride (pixbuf),
-                                     gdk_pixbuf_get_has_alpha (pixbuf) ? 3 : 4,
+                                     gdk_pixbuf_get_has_alpha (pixbuf) ? 4 : 3,
                                      0,
                                      &error);
   if (error)
@@ -219,7 +219,7 @@ gtk_clutter_texture_set_from_pixbuf (ClutterTexture *texture,
                                      gdk_pixbuf_get_width (pixbuf),
                                      gdk_pixbuf_get_height (pixbuf),
                                      gdk_pixbuf_get_rowstride (pixbuf),
-                                     gdk_pixbuf_get_has_alpha (pixbuf) ? 3 : 4,
+                                     gdk_pixbuf_get_has_alpha (pixbuf) ? 4 : 3,
                                      0,
                                      &error);
   if (error)