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  <eb@berns.prima.de>

	* 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 ebae7289fef7a85dfaa8b18fe8ef3ba9bad72cfb..4b5a37a08536c2d2d40443d355bfd7cb128dc7a8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Feb 22 00:20:12 MET 1998  Eckehard Berns  <eb@berns.prima.de>
+
+       * 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  <scott@poverty.bloomington.in.us>
 
        * 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 ebae7289fef7a85dfaa8b18fe8ef3ba9bad72cfb..4b5a37a08536c2d2d40443d355bfd7cb128dc7a8 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Sun Feb 22 00:20:12 MET 1998  Eckehard Berns  <eb@berns.prima.de>
+
+       * 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  <scott@poverty.bloomington.in.us>
 
        * 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 ebae7289fef7a85dfaa8b18fe8ef3ba9bad72cfb..4b5a37a08536c2d2d40443d355bfd7cb128dc7a8 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Sun Feb 22 00:20:12 MET 1998  Eckehard Berns  <eb@berns.prima.de>
+
+       * 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  <scott@poverty.bloomington.in.us>
 
        * 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 ebae7289fef7a85dfaa8b18fe8ef3ba9bad72cfb..4b5a37a08536c2d2d40443d355bfd7cb128dc7a8 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Sun Feb 22 00:20:12 MET 1998  Eckehard Berns  <eb@berns.prima.de>
+
+       * 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  <scott@poverty.bloomington.in.us>
 
        * 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 ebae7289fef7a85dfaa8b18fe8ef3ba9bad72cfb..4b5a37a08536c2d2d40443d355bfd7cb128dc7a8 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Sun Feb 22 00:20:12 MET 1998  Eckehard Berns  <eb@berns.prima.de>
+
+       * 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  <scott@poverty.bloomington.in.us>
 
        * 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 ebae7289fef7a85dfaa8b18fe8ef3ba9bad72cfb..4b5a37a08536c2d2d40443d355bfd7cb128dc7a8 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Sun Feb 22 00:20:12 MET 1998  Eckehard Berns  <eb@berns.prima.de>
+
+       * 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  <scott@poverty.bloomington.in.us>
 
        * 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 ebae7289fef7a85dfaa8b18fe8ef3ba9bad72cfb..4b5a37a08536c2d2d40443d355bfd7cb128dc7a8 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Sun Feb 22 00:20:12 MET 1998  Eckehard Berns  <eb@berns.prima.de>
+
+       * 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  <scott@poverty.bloomington.in.us>
 
        * gtk/gtkentry.c (gtk_entry_set_text): Added a test for passing a

diff --git a/gdk/gdkcc.c b/gdk/gdkcc.c
index 7224b3e9399aed488e5574b7f8543b2374097bed..28ecad7febe1c871dd8f60524bfa006d1177ab0a 100644 (file)
--- 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 7224b3e9399aed488e5574b7f8543b2374097bed..28ecad7febe1c871dd8f60524bfa006d1177ab0a 100644 (file)
--- 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
        {