From 4997dc2aa5d89155452b5acbe3217aba51b4b6fb Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Fri, 15 Mar 2002 20:43:13 +0000 Subject: [PATCH] Fix byte shift arithmetic for big-endian. (Tracked down with help from Fri Mar 15 15:37:01 2002 Owen Taylor * gdk/x11/gdkdrawable-x11.c (convert_to_format): Fix byte shift arithmetic for big-endian. (Tracked down with help from Tuomas Kuosmanen) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ NEWS | 2 +- gdk/x11/gdkdrawable-x11.c | 4 ++-- 9 files changed, 45 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 88d80f6c4..942535e87 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Mar 15 15:37:01 2002 Owen Taylor + + * 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 * gtk/gtktreeview.c (gtk_tree_view_insert_column_with_data_func): diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 88d80f6c4..942535e87 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Fri Mar 15 15:37:01 2002 Owen Taylor + + * 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 * gtk/gtktreeview.c (gtk_tree_view_insert_column_with_data_func): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 88d80f6c4..942535e87 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Fri Mar 15 15:37:01 2002 Owen Taylor + + * 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 * gtk/gtktreeview.c (gtk_tree_view_insert_column_with_data_func): diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 88d80f6c4..942535e87 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Fri Mar 15 15:37:01 2002 Owen Taylor + + * 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 * gtk/gtktreeview.c (gtk_tree_view_insert_column_with_data_func): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 88d80f6c4..942535e87 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Fri Mar 15 15:37:01 2002 Owen Taylor + + * 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 * gtk/gtktreeview.c (gtk_tree_view_insert_column_with_data_func): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 88d80f6c4..942535e87 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Fri Mar 15 15:37:01 2002 Owen Taylor + + * 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 * gtk/gtktreeview.c (gtk_tree_view_insert_column_with_data_func): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 88d80f6c4..942535e87 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Fri Mar 15 15:37:01 2002 Owen Taylor + + * 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 * gtk/gtktreeview.c (gtk_tree_view_insert_column_with_data_func): diff --git a/NEWS b/NEWS index 4955bd963..b374c6e3d 100644 --- 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 89c7661ff..147a356f7 100644 --- 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++; } -- 2.43.2