Fixed the LSB -> MSB case. Fixes #79463. (rgb565msb): Fix the MSB -> MSBgtk-multihead

2002-07-16  Federico Mena Quintero  <federico@ximian.com>

	* gdk/gdkpixbuf-drawable.c (rgb565lsb): Fixed the LSB -> MSB case.
	Fixes #79463.
	(rgb565msb): Fix the MSB -> MSB case. Fixes #79190.

7 files changed, 50 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index 10fa712f22..0a1773f2cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-07-16  Federico Mena Quintero  <federico@ximian.com>
+
+	* gdk/gdkpixbuf-drawable.c (rgb565lsb): Fixed the LSB -> MSB case.
+	Fixes #79463.
+	(rgb565msb): Fix the MSB -> MSB case. Fixes #79190.
+
 Fri Apr 19 16:30:09 2002  Kristian Rietveld  <kris@gtk.org>
 
 	* gtk/gtktreeprivate.h, gtk/gtktreeview.c: rename
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 10fa712f22..0a1773f2cb 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2002-07-16  Federico Mena Quintero  <federico@ximian.com>
+
+	* gdk/gdkpixbuf-drawable.c (rgb565lsb): Fixed the LSB -> MSB case.
+	Fixes #79463.
+	(rgb565msb): Fix the MSB -> MSB case. Fixes #79190.
+
 Fri Apr 19 16:30:09 2002  Kristian Rietveld  <kris@gtk.org>
 
 	* gtk/gtktreeprivate.h, gtk/gtktreeview.c: rename
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 10fa712f22..0a1773f2cb 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+2002-07-16  Federico Mena Quintero  <federico@ximian.com>
+
+	* gdk/gdkpixbuf-drawable.c (rgb565lsb): Fixed the LSB -> MSB case.
+	Fixes #79463.
+	(rgb565msb): Fix the MSB -> MSB case. Fixes #79190.
+
 Fri Apr 19 16:30:09 2002  Kristian Rietveld  <kris@gtk.org>
 
 	* gtk/gtktreeprivate.h, gtk/gtktreeview.c: rename
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 10fa712f22..0a1773f2cb 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+2002-07-16  Federico Mena Quintero  <federico@ximian.com>
+
+	* gdk/gdkpixbuf-drawable.c (rgb565lsb): Fixed the LSB -> MSB case.
+	Fixes #79463.
+	(rgb565msb): Fix the MSB -> MSB case. Fixes #79190.
+
 Fri Apr 19 16:30:09 2002  Kristian Rietveld  <kris@gtk.org>
 
 	* gtk/gtktreeprivate.h, gtk/gtktreeview.c: rename
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 10fa712f22..0a1773f2cb 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2002-07-16  Federico Mena Quintero  <federico@ximian.com>
+
+	* gdk/gdkpixbuf-drawable.c (rgb565lsb): Fixed the LSB -> MSB case.
+	Fixes #79463.
+	(rgb565msb): Fix the MSB -> MSB case. Fixes #79190.
+
 Fri Apr 19 16:30:09 2002  Kristian Rietveld  <kris@gtk.org>
 
 	* gtk/gtktreeprivate.h, gtk/gtktreeview.c: rename
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 10fa712f22..0a1773f2cb 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2002-07-16  Federico Mena Quintero  <federico@ximian.com>
+
+	* gdk/gdkpixbuf-drawable.c (rgb565lsb): Fixed the LSB -> MSB case.
+	Fixes #79463.
+	(rgb565msb): Fix the MSB -> MSB case. Fixes #79190.
+
 Fri Apr 19 16:30:09 2002  Kristian Rietveld  <kris@gtk.org>
 
 	* gtk/gtktreeprivate.h, gtk/gtktreeview.c: rename
diff --git a/gdk/gdkpixbuf-drawable.c b/gdk/gdkpixbuf-drawable.c
index 624cac09ae..9d4630e7cd 100644
--- a/gdk/gdkpixbuf-drawable.c
+++ b/gdk/gdkpixbuf-drawable.c
@@ -437,14 +437,15 @@ rgb565lsb (GdkImage    *image,
 	    | (data & 0x1f0000) >> 5 | (data & 0x1c0000) >> 10;
 #else
 	  /* swap endianness first */
-	  data = s[1] | s[0] << 8 | s[3] << 16 | s[2] << 24;
+	  data = s[1] << 24 | s[0] << 16 | s[3] << 8 | s[2];
 	  s += 4;
-	  *o++ = (data & 0xf800) | (data & 0xe000) >> 5
-	    | (data & 0x7e0) >> 3 | (data & 0x600) >> 9;
-	  *o++ = (data & 0x1f) << 11 | (data & 0x1c) << 6
-	    | (data & 0xf8000000) >> 24 | (data & 0xe0000000) >> 29;
-	  *o++ = (data & 0x7e00000) >> 11 | (data & 0x6000000) >> 17
-	    | (data & 0x1f0000) >> 13 | (data & 0x1c0000) >> 18;
+
+	  *o++ = (data & 0xf8000000) >> 16 | (data & 0xe0000000) >> 21
+	    | (data & 0x7e00000) >> 19 | (data & 0x6000000) >> 25;
+	  *o++ = (data & 0x1f0000) >> 5 | (data & 0x1c0000) >> 10
+	    | (data & 0xf800) >> 8 | (data & 0xe000) >> 13;
+	  *o++ = (data & 0x7e0) << 5 | (data & 0x600) >> 1
+	    | (data & 0x1f) << 3 | (data & 0x1c) >> 2;
 #endif
 	}
       /* check for last remaining pixel */
@@ -544,12 +545,12 @@ rgb565msb (GdkImage    *image,
 	    | (data & 0x1f0000) >> 5 | (data & 0x1c0000) >> 10;
 #else
 	  data = *s++;
-	  *o++ = (data & 0xf800) | (data & 0xe000) >> 5
-	    | (data & 0x7e0) >> 3 | (data & 0x600) >> 9;
-	  *o++ = (data & 0x1f) << 11 | (data & 0x1c) << 6
-	    | (data & 0xf8000000) >> 24 | (data & 0xe0000000) >> 29;
-	  *o++ = (data & 0x7e00000) >> 11 | (data & 0x6000000) >> 17
-	    | (data & 0x1f0000) >> 13 | (data & 0x1c0000) >> 18;
+	  *o++ = (data & 0xf8000000) >> 16 | (data & 0xe0000000) >> 21
+	    | (data & 0x7e00000) >> 19 | (data & 0x6000000) >> 25;
+	  *o++ = (data & 0x1f0000) >> 5 | (data & 0x1c0000) >> 10
+	    | (data & 0xf800) >> 8 | (data & 0xe000) >> 13;
+	  *o++ = (data & 0x7e0) << 5 | (data & 0x600) >> 1
+	    | (data & 0x1f) << 3 | (data & 0x1c) >> 2;
 #endif
 	}
       /* check for last remaining pixel */