[gtk+/gtk-3-6] bitmask: Fix intersection code



commit 919ab92ac13b90438101d4cc18137dbbdb694b64
Author: Benjamin Otte <otte redhat com>
Date:   Sat Nov 10 18:35:37 2012 +0100

    bitmask: Fix intersection code
    
    With the fix in 77912a65e2aa6eb9cfee994fa93bbfbc6b9f8538, another bug
    got visible: booleans are 32 bits, so if the intersection between the 2
    bitmasks happened in higher bits, the return value would be truncated to
    FALSE.
    
    This actually made slider handles disappear, so it was pretty visible.

 gtk/gtkbitmaskprivateimpl.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/gtk/gtkbitmaskprivateimpl.h b/gtk/gtkbitmaskprivateimpl.h
index c46fa96..c0058c7 100644
--- a/gtk/gtkbitmaskprivateimpl.h
+++ b/gtk/gtkbitmaskprivateimpl.h
@@ -163,5 +163,5 @@ _gtk_bitmask_intersects (const GtkBitmask *mask,
       _gtk_bitmask_is_allocated (other))
     return _gtk_allocated_bitmask_intersects (mask, other);
   else
-    return _gtk_bitmask_to_bits (mask) & _gtk_bitmask_to_bits (other);
+    return _gtk_bitmask_to_bits (mask) & _gtk_bitmask_to_bits (other) ? TRUE : FALSE;
 }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]