From dd19f542db208a1f5c0b3c1f04aa5925b9eddc1b Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Fri, 24 Jun 2005 15:06:29 +0000 Subject: [PATCH] Fix up selection of conversion functions for MSB machines: 2005-06-24 Owen Taylor * gdk/gdkrgb.c (gdk_rgb_select_conv): Fix up selection of conversion functions for MSB machines: convert_0888[_br] now work on bytes so are endian independent. (Reported by David Zeuthen) --- ChangeLog | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ gdk/gdkrgb.c | 22 ++++++---------------- 4 files changed, 27 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index d4e8630f89..69b6089187 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-06-24 Owen Taylor + + * gdk/gdkrgb.c (gdk_rgb_select_conv): Fix up selection of + conversion functions for MSB machines: convert_0888[_br] + now work on bytes so are endian independent. + (Reported by David Zeuthen) + 2005-06-24 Matthias Clasen * gtk/gtktextview.c (gtk_text_view_scroll_hpages): Don't diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index d4e8630f89..69b6089187 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +2005-06-24 Owen Taylor + + * gdk/gdkrgb.c (gdk_rgb_select_conv): Fix up selection of + conversion functions for MSB machines: convert_0888[_br] + now work on bytes so are endian independent. + (Reported by David Zeuthen) + 2005-06-24 Matthias Clasen * gtk/gtktextview.c (gtk_text_view_scroll_hpages): Don't diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index d4e8630f89..69b6089187 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +2005-06-24 Owen Taylor + + * gdk/gdkrgb.c (gdk_rgb_select_conv): Fix up selection of + conversion functions for MSB machines: convert_0888[_br] + now work on bytes so are endian independent. + (Reported by David Zeuthen) + 2005-06-24 Matthias Clasen * gtk/gtktextview.c (gtk_text_view_scroll_hpages): Don't diff --git a/gdk/gdkrgb.c b/gdk/gdkrgb.c index d78584216d..a7aa8920ba 100644 --- a/gdk/gdkrgb.c +++ b/gdk/gdkrgb.c @@ -3135,17 +3135,17 @@ gdk_rgb_select_conv (GdkRgbInfo *image_info) ((mask_rgb && byte_order == GDK_MSB_FIRST) || (mask_bgr && byte_order == GDK_LSB_FIRST))) conv = gdk_rgb_convert_888_msb; -#if G_BYTE_ORDER == G_BIG_ENDIAN - else if (bpp == 32 && - (depth == 24 || depth == 32) && - vtype == GDK_VISUAL_TRUE_COLOR && - (mask_rgb && byte_order == GDK_LSB_FIRST)) - conv = gdk_rgb_convert_0888_br; else if (bpp == 32 && (depth == 24 || depth == 32) && vtype == GDK_VISUAL_TRUE_COLOR && (mask_rgb && byte_order == GDK_MSB_FIRST)) + conv = gdk_rgb_convert_0888_br; + else if (bpp == 32 && + (depth == 24 || depth == 32) && + vtype == GDK_VISUAL_TRUE_COLOR && + (mask_rgb && byte_order == GDK_LSB_FIRST)) conv = gdk_rgb_convert_0888; +#if G_BYTE_ORDER == G_BIG_ENDIAN else if (bpp == 32 && depth == 24 && vtype == GDK_VISUAL_TRUE_COLOR && (mask_bgr && byte_order == GDK_MSB_FIRST)) conv = gdk_rgb_convert_8880_br; @@ -3156,16 +3156,6 @@ gdk_rgb_select_conv (GdkRgbInfo *image_info) (mask_rgb && byte_order == GDK_MSB_FIRST)) conv = gdk_rgb_convert_8880_br; #else - else if (bpp == 32 && - (depth == 24 || depth == 32) && - vtype == GDK_VISUAL_TRUE_COLOR && - (mask_rgb && byte_order == GDK_MSB_FIRST)) - conv = gdk_rgb_convert_0888_br; - else if (bpp == 32 && - (depth == 24 || depth == 32) && - vtype == GDK_VISUAL_TRUE_COLOR && - (mask_rgb && byte_order == GDK_LSB_FIRST)) - conv = gdk_rgb_convert_0888; else if (bpp == 32 && depth == 24 && vtype == GDK_VISUAL_TRUE_COLOR && (mask_bgr && byte_order == GDK_LSB_FIRST)) conv = gdk_rgb_convert_8880_br;