From: MET 1998 Eckehard Berns Date: Sat, 21 Feb 1998 23:25:34 +0000 (+0000) Subject: fixed a bug for mode GDK_CC_MODE_TRUE, when on a 24-bit visual on a 32-bit X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=e00c0594a3a338cd99e80bf4bcccc86d83febcaf;p=~andy%2Fgtk fixed a bug for mode GDK_CC_MODE_TRUE, when on a 24-bit visual on a 32-bit Sun Feb 22 00:20:12 MET 1998 Eckehard Berns * gdk/gdkcc.c (gdk_color_context_query_colors): fixed a bug for mode GDK_CC_MODE_TRUE, when on a 24-bit visual on a 32-bit mashine. --- diff --git a/ChangeLog b/ChangeLog index ebae7289f..4b5a37a08 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Feb 22 00:20:12 MET 1998 Eckehard Berns + + * gdk/gdkcc.c (gdk_color_context_query_colors): fixed a bug for mode + GDK_CC_MODE_TRUE, when on a 24-bit visual on a 32-bit mashine. + Sat Feb 21 12:06:11 1998 Scott Goehring * gtk/gtkentry.c (gtk_entry_set_text): Added a test for passing a diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index ebae7289f..4b5a37a08 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Sun Feb 22 00:20:12 MET 1998 Eckehard Berns + + * gdk/gdkcc.c (gdk_color_context_query_colors): fixed a bug for mode + GDK_CC_MODE_TRUE, when on a 24-bit visual on a 32-bit mashine. + Sat Feb 21 12:06:11 1998 Scott Goehring * gtk/gtkentry.c (gtk_entry_set_text): Added a test for passing a diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index ebae7289f..4b5a37a08 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Sun Feb 22 00:20:12 MET 1998 Eckehard Berns + + * gdk/gdkcc.c (gdk_color_context_query_colors): fixed a bug for mode + GDK_CC_MODE_TRUE, when on a 24-bit visual on a 32-bit mashine. + Sat Feb 21 12:06:11 1998 Scott Goehring * gtk/gtkentry.c (gtk_entry_set_text): Added a test for passing a diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index ebae7289f..4b5a37a08 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Sun Feb 22 00:20:12 MET 1998 Eckehard Berns + + * gdk/gdkcc.c (gdk_color_context_query_colors): fixed a bug for mode + GDK_CC_MODE_TRUE, when on a 24-bit visual on a 32-bit mashine. + Sat Feb 21 12:06:11 1998 Scott Goehring * gtk/gtkentry.c (gtk_entry_set_text): Added a test for passing a diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index ebae7289f..4b5a37a08 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Sun Feb 22 00:20:12 MET 1998 Eckehard Berns + + * gdk/gdkcc.c (gdk_color_context_query_colors): fixed a bug for mode + GDK_CC_MODE_TRUE, when on a 24-bit visual on a 32-bit mashine. + Sat Feb 21 12:06:11 1998 Scott Goehring * gtk/gtkentry.c (gtk_entry_set_text): Added a test for passing a diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index ebae7289f..4b5a37a08 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Sun Feb 22 00:20:12 MET 1998 Eckehard Berns + + * gdk/gdkcc.c (gdk_color_context_query_colors): fixed a bug for mode + GDK_CC_MODE_TRUE, when on a 24-bit visual on a 32-bit mashine. + Sat Feb 21 12:06:11 1998 Scott Goehring * gtk/gtkentry.c (gtk_entry_set_text): Added a test for passing a diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index ebae7289f..4b5a37a08 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Sun Feb 22 00:20:12 MET 1998 Eckehard Berns + + * gdk/gdkcc.c (gdk_color_context_query_colors): fixed a bug for mode + GDK_CC_MODE_TRUE, when on a 24-bit visual on a 32-bit mashine. + Sat Feb 21 12:06:11 1998 Scott Goehring * gtk/gtkentry.c (gtk_entry_set_text): Added a test for passing a diff --git a/gdk/gdkcc.c b/gdk/gdkcc.c index 7224b3e93..28ecad7fe 100644 --- a/gdk/gdkcc.c +++ b/gdk/gdkcc.c @@ -1405,9 +1405,9 @@ gdk_color_context_query_colors (GdkColorContext *cc, if (cc->clut == NULL) for (i = 0, tc = colors; i < num_colors; i++, tc++) { - tc->red = (tc->pixel & cc->masks.red) * 65535 / cc->masks.red; - tc->green = (tc->pixel & cc->masks.green) * 65535 / cc->masks.green; - tc->blue = (tc->pixel & cc->masks.blue) * 65535 / cc->masks.blue; + tc->red = ((tc->pixel & cc->masks.red) >> cc->shifts.red) << (16 - cc->bits.red); + tc->green = ((tc->pixel & cc->masks.green) >> cc->shifts.green) << (16 - cc->bits.green); + tc->blue = ((tc->pixel & cc->masks.blue) >> cc->shifts.blue) << (16 - cc->bits.blue); } else { diff --git a/gdk/x11/gdkcc-x11.c b/gdk/x11/gdkcc-x11.c index 7224b3e93..28ecad7fe 100644 --- a/gdk/x11/gdkcc-x11.c +++ b/gdk/x11/gdkcc-x11.c @@ -1405,9 +1405,9 @@ gdk_color_context_query_colors (GdkColorContext *cc, if (cc->clut == NULL) for (i = 0, tc = colors; i < num_colors; i++, tc++) { - tc->red = (tc->pixel & cc->masks.red) * 65535 / cc->masks.red; - tc->green = (tc->pixel & cc->masks.green) * 65535 / cc->masks.green; - tc->blue = (tc->pixel & cc->masks.blue) * 65535 / cc->masks.blue; + tc->red = ((tc->pixel & cc->masks.red) >> cc->shifts.red) << (16 - cc->bits.red); + tc->green = ((tc->pixel & cc->masks.green) >> cc->shifts.green) << (16 - cc->bits.green); + tc->blue = ((tc->pixel & cc->masks.blue) >> cc->shifts.blue) << (16 - cc->bits.blue); } else {