[HarfBuzz] harfbuzz-ng: Branch 'master'

[Behdad Esfahbod]

 src/hb-set-private.hh |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit e2b8d75fa6e847ecf5c040f4e1e16a565c5d8aaf
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Aug 1 22:17:48 2012 -0400

    Use wider set digests on 64-bit archs

diff --git a/src/hb-set-private.hh b/src/hb-set-private.hh
index 537319a..550b7f2 100644
--- a/src/hb-set-private.hh
+++ b/src/hb-set-private.hh
@@ -36,7 +36,7 @@ struct hb_set_digest_common_bits_t
 {
   ASSERT_POD ();
 
-  typedef uint16_t mask_t;
+  typedef unsigned int mask_t;
 
   inline void init (void) {
     mask = ~0;
@@ -72,7 +72,7 @@ struct hb_set_digest_lowest_bits_t
 {
   ASSERT_POD ();
 
-  typedef uint32_t mask_t;
+  typedef unsigned long mask_t;
 
   inline void init (void) {
     mask = 0;
@@ -94,7 +94,7 @@ struct hb_set_digest_lowest_bits_t
 
   private:
 
-  mask_t mask_for (hb_codepoint_t g) const { return 1 << (g & (sizeof (mask_t) * 8 - 1)); }
+  mask_t mask_for (hb_codepoint_t g) const { return ((mask_t) 1) << (g & (sizeof (mask_t) * 8 - 1)); }
   mask_t mask;
 };