diff options
| author | Owen Taylor <otaylor@redhat.com> | 2005-06-24 15:06:29 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2005-06-24 15:06:29 +0000 |
| commit | dd19f542db208a1f5c0b3c1f04aa5925b9eddc1b (patch) | |
| tree | 368105b7c853f50625d7925e4fa7c154b3d9bc3e | |
| parent | 47ab9b2dc975db8d8a1f841956e4576f9b651e4a (diff) | |
| download | gtk+-dd19f542db208a1f5c0b3c1f04aa5925b9eddc1b.tar.gz | |
Fix up selection of conversion functions for MSB machines:
2005-06-24 Owen Taylor <otaylor@redhat.com>
* 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)
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 7 | ||||
| -rw-r--r-- | gdk/gdkrgb.c | 16 |
4 files changed, 24 insertions, 13 deletions
@@ -1,3 +1,10 @@ +2005-06-24 Owen Taylor <otaylor@redhat.com> + + * 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 <mclasen@redhat.com> * 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 <otaylor@redhat.com> + + * 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 <mclasen@redhat.com> * 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 <otaylor@redhat.com> + + * 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 <mclasen@redhat.com> * 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)) + (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_MSB_FIRST)) + (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; |