Fix the MSB -> MSB case. Fixes #79190.

2002-06-03  Federico Mena Quintero  <federico@ximian.com>

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

diff --git a/ChangeLog b/ChangeLog
index fd6bb4e78a445466a4c557edfde95e6b1e61bc78..00f885dd411df7c4b4875e4e9b8690d294331f5c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-03  Federico Mena Quintero  <federico@ximian.com>
+
+       * gdk/gdkpixbuf-drawable.c (rgb565msb): Fix the MSB -> MSB case.
+       Fixes #79190.
+
 Sat Jun  1 10:43:28 2002  Jonathan Blandford  <jrb@gnome.org>
 
        * gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render): 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index fd6bb4e78a445466a4c557edfde95e6b1e61bc78..00f885dd411df7c4b4875e4e9b8690d294331f5c 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2002-06-03  Federico Mena Quintero  <federico@ximian.com>
+
+       * gdk/gdkpixbuf-drawable.c (rgb565msb): Fix the MSB -> MSB case.
+       Fixes #79190.
+
 Sat Jun  1 10:43:28 2002  Jonathan Blandford  <jrb@gnome.org>
 
        * gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render): 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index fd6bb4e78a445466a4c557edfde95e6b1e61bc78..00f885dd411df7c4b4875e4e9b8690d294331f5c 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2002-06-03  Federico Mena Quintero  <federico@ximian.com>
+
+       * gdk/gdkpixbuf-drawable.c (rgb565msb): Fix the MSB -> MSB case.
+       Fixes #79190.
+
 Sat Jun  1 10:43:28 2002  Jonathan Blandford  <jrb@gnome.org>
 
        * gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render): 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index fd6bb4e78a445466a4c557edfde95e6b1e61bc78..00f885dd411df7c4b4875e4e9b8690d294331f5c 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2002-06-03  Federico Mena Quintero  <federico@ximian.com>
+
+       * gdk/gdkpixbuf-drawable.c (rgb565msb): Fix the MSB -> MSB case.
+       Fixes #79190.
+
 Sat Jun  1 10:43:28 2002  Jonathan Blandford  <jrb@gnome.org>
 
        * gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render): 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index fd6bb4e78a445466a4c557edfde95e6b1e61bc78..00f885dd411df7c4b4875e4e9b8690d294331f5c 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2002-06-03  Federico Mena Quintero  <federico@ximian.com>
+
+       * gdk/gdkpixbuf-drawable.c (rgb565msb): Fix the MSB -> MSB case.
+       Fixes #79190.
+
 Sat Jun  1 10:43:28 2002  Jonathan Blandford  <jrb@gnome.org>
 
        * gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render): 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index fd6bb4e78a445466a4c557edfde95e6b1e61bc78..00f885dd411df7c4b4875e4e9b8690d294331f5c 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2002-06-03  Federico Mena Quintero  <federico@ximian.com>
+
+       * gdk/gdkpixbuf-drawable.c (rgb565msb): Fix the MSB -> MSB case.
+       Fixes #79190.
+
 Sat Jun  1 10:43:28 2002  Jonathan Blandford  <jrb@gnome.org>
 
        * gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render): 

diff --git a/gdk/gdkpixbuf-drawable.c b/gdk/gdkpixbuf-drawable.c
index 0a4474969d1edf5c3c4ba275be0b4535d0f648eb..ddf3458fdd573228ca92c21551bb972765b3d063 100644 (file)
--- a/gdk/gdkpixbuf-drawable.c
+++ b/gdk/gdkpixbuf-drawable.c
@@ -544,12 +544,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 */