diff options
Diffstat (limited to 'gdk/gdkrgb.c')
| -rw-r--r-- | gdk/gdkrgb.c | 16 |
1 files changed, 3 insertions, 13 deletions
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; |