Fix byte shift arithmetic for big-endian. (Tracked down with help from

Fri Mar 15 15:37:01 2002  Owen Taylor  <otaylor@redhat.com>

        * gdk/x11/gdkdrawable-x11.c (convert_to_format):
        Fix byte shift arithmetic for big-endian. (Tracked
        down with help from Tuomas Kuosmanen)

diff --git a/ChangeLog b/ChangeLog
index 88d80f6c4e5cbe6d20bd6a4b69503be35d263092..942535e87b774030664229cf2de02bada337f8f9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Mar 15 15:37:01 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkdrawable-x11.c (convert_to_format): 
+       Fix byte shift arithmetic for big-endian. (Tracked
+       down with help from Tuomas Kuosmanen)
+
 Fri Mar 15 11:28:41 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_insert_column_with_data_func):

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 88d80f6c4e5cbe6d20bd6a4b69503be35d263092..942535e87b774030664229cf2de02bada337f8f9 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Fri Mar 15 15:37:01 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkdrawable-x11.c (convert_to_format): 
+       Fix byte shift arithmetic for big-endian. (Tracked
+       down with help from Tuomas Kuosmanen)
+
 Fri Mar 15 11:28:41 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_insert_column_with_data_func):

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 88d80f6c4e5cbe6d20bd6a4b69503be35d263092..942535e87b774030664229cf2de02bada337f8f9 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Fri Mar 15 15:37:01 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkdrawable-x11.c (convert_to_format): 
+       Fix byte shift arithmetic for big-endian. (Tracked
+       down with help from Tuomas Kuosmanen)
+
 Fri Mar 15 11:28:41 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_insert_column_with_data_func):

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 88d80f6c4e5cbe6d20bd6a4b69503be35d263092..942535e87b774030664229cf2de02bada337f8f9 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Fri Mar 15 15:37:01 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkdrawable-x11.c (convert_to_format): 
+       Fix byte shift arithmetic for big-endian. (Tracked
+       down with help from Tuomas Kuosmanen)
+
 Fri Mar 15 11:28:41 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_insert_column_with_data_func):

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 88d80f6c4e5cbe6d20bd6a4b69503be35d263092..942535e87b774030664229cf2de02bada337f8f9 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Fri Mar 15 15:37:01 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkdrawable-x11.c (convert_to_format): 
+       Fix byte shift arithmetic for big-endian. (Tracked
+       down with help from Tuomas Kuosmanen)
+
 Fri Mar 15 11:28:41 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_insert_column_with_data_func):

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 88d80f6c4e5cbe6d20bd6a4b69503be35d263092..942535e87b774030664229cf2de02bada337f8f9 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Fri Mar 15 15:37:01 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkdrawable-x11.c (convert_to_format): 
+       Fix byte shift arithmetic for big-endian. (Tracked
+       down with help from Tuomas Kuosmanen)
+
 Fri Mar 15 11:28:41 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_insert_column_with_data_func):

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 88d80f6c4e5cbe6d20bd6a4b69503be35d263092..942535e87b774030664229cf2de02bada337f8f9 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Fri Mar 15 15:37:01 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkdrawable-x11.c (convert_to_format): 
+       Fix byte shift arithmetic for big-endian. (Tracked
+       down with help from Tuomas Kuosmanen)
+
 Fri Mar 15 11:28:41 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_insert_column_with_data_func):

diff --git a/NEWS b/NEWS
index 4955bd963930bf3e120c6a7140541ad485e2202c..b374c6e3daf2826c9b01a6d025e454e7445b88e8 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -35,7 +35,7 @@ Overview of Changes in GTK+ 1.3.15
 ==================================
 
 * New stock and improved icon images
-  [Tuomas Kuosomann, Jakub Steiner, Anders Carlsson]
+  [Tuomas Kuosmanen, Jakub Steiner, Anders Carlsson]
 * Widget drawing improvements for check and radio buttons,
   spinbuttons [Soeren Sandmann]
 * Clean up module search path algorithm, use GTK_PATH [Owen Taylor]

diff --git a/gdk/x11/gdkdrawable-x11.c b/gdk/x11/gdkdrawable-x11.c
index 89c7661ff41b3d088f02f554525b7afddf8adb1e..147a356f75d1504a5ed300acefe15cea3676aa8a 100644 (file)
--- a/gdk/x11/gdkdrawable-x11.c
+++ b/gdk/x11/gdkdrawable-x11.c
@@ -1033,8 +1033,8 @@ convert_to_format (guchar        *src_buf,
                
                while (p < end)
                  {
-                   *q = (((*p & 0xff000000) >> 24) |
-                         ((*p & 0x00ffffff) << 8));
+                   *q = (((*p & 0xffffff00) >> 8) |
+                         ((*p & 0x000000ff) << 24));
                    q++;
                    p++;
                  }