Fixed the LSB -> MSB case. Fixes #79463.

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

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

diff --git a/ChangeLog b/ChangeLog
index 6017d288d710a7ff6215279a0a7f5deb57f977ad..b3ddcd3f4f147a314f44260104bbd2e3d997311b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-16  Federico Mena Quintero  <federico@ximian.com>
+
+       * gdk/gdkpixbuf-drawable.c (rgb565lsb): Fixed the LSB -> MSB case.
+       Fixes #79463.
+
 2002-07-16  Sven Neumann  <sven@gimp.org>
 
        * gdk/gdk.c

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 6017d288d710a7ff6215279a0a7f5deb57f977ad..b3ddcd3f4f147a314f44260104bbd2e3d997311b 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2002-07-16  Federico Mena Quintero  <federico@ximian.com>
+
+       * gdk/gdkpixbuf-drawable.c (rgb565lsb): Fixed the LSB -> MSB case.
+       Fixes #79463.
+
 2002-07-16  Sven Neumann  <sven@gimp.org>
 
        * gdk/gdk.c

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 6017d288d710a7ff6215279a0a7f5deb57f977ad..b3ddcd3f4f147a314f44260104bbd2e3d997311b 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2002-07-16  Federico Mena Quintero  <federico@ximian.com>
+
+       * gdk/gdkpixbuf-drawable.c (rgb565lsb): Fixed the LSB -> MSB case.
+       Fixes #79463.
+
 2002-07-16  Sven Neumann  <sven@gimp.org>
 
        * gdk/gdk.c

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 6017d288d710a7ff6215279a0a7f5deb57f977ad..b3ddcd3f4f147a314f44260104bbd2e3d997311b 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2002-07-16  Federico Mena Quintero  <federico@ximian.com>
+
+       * gdk/gdkpixbuf-drawable.c (rgb565lsb): Fixed the LSB -> MSB case.
+       Fixes #79463.
+
 2002-07-16  Sven Neumann  <sven@gimp.org>
 
        * gdk/gdk.c

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 6017d288d710a7ff6215279a0a7f5deb57f977ad..b3ddcd3f4f147a314f44260104bbd2e3d997311b 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2002-07-16  Federico Mena Quintero  <federico@ximian.com>
+
+       * gdk/gdkpixbuf-drawable.c (rgb565lsb): Fixed the LSB -> MSB case.
+       Fixes #79463.
+
 2002-07-16  Sven Neumann  <sven@gimp.org>
 
        * gdk/gdk.c

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 6017d288d710a7ff6215279a0a7f5deb57f977ad..b3ddcd3f4f147a314f44260104bbd2e3d997311b 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2002-07-16  Federico Mena Quintero  <federico@ximian.com>
+
+       * gdk/gdkpixbuf-drawable.c (rgb565lsb): Fixed the LSB -> MSB case.
+       Fixes #79463.
+
 2002-07-16  Sven Neumann  <sven@gimp.org>
 
        * gdk/gdk.c

diff --git a/gdk/gdkpixbuf-drawable.c b/gdk/gdkpixbuf-drawable.c
index ddf3458fdd573228ca92c21551bb972765b3d063..ca25768aeb5a6ad84f0bf87f3fc257b8429096f2 100644 (file)
--- 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 */