[HarfBuzz] harfbuzz: Branch 'master' - 2 commits

[Behdad Esfahbod]

 src/hb-ot-shape-fallback.cc |    2 +-
 src/hb-set-private.hh       |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c26a52fbe62e5ba4d0e1e2ba13bfb6ceb3f773dc
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Sun Nov 4 16:48:45 2012 -0800

    Minor

diff --git a/src/hb-ot-shape-fallback.cc b/src/hb-ot-shape-fallback.cc
index eb7777e..5dc554c 100644
--- a/src/hb-ot-shape-fallback.cc
+++ b/src/hb-ot-shape-fallback.cc
@@ -311,7 +311,7 @@ position_around_base (const hb_ot_shape_plan_t *plan,
   hb_glyph_extents_t component_extents = base_extents;
   unsigned int last_lig_component = (unsigned int) -1;
   unsigned int last_combining_class = 255;
-  hb_glyph_extents_t cluster_extents;
+  hb_glyph_extents_t cluster_extents = base_extents; /* Initialization is just to shut gcc up. */
   for (unsigned int i = base + 1; i < end; i++)
     if (_hb_glyph_info_get_modified_combining_class (&buffer->info[i]))
     {
commit f60d3ed35d94f1adcfd73ca05d03d7e81fb5de03
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Sun Nov 4 16:44:47 2012 -0800

    Minor

diff --git a/src/hb-set-private.hh b/src/hb-set-private.hh
index 4413579..43cf925 100644
--- a/src/hb-set-private.hh
+++ b/src/hb-set-private.hh
@@ -98,7 +98,7 @@ struct hb_set_digest_lowest_bits_t
 
   private:
 
-  mask_t mask_for (hb_codepoint_t g) const { return ((mask_t) 1) << (g & (sizeof (mask_t) * 8 - 1)); }
+  static inline mask_t mask_for (hb_codepoint_t g) { return ((mask_t) 1) << (g & (sizeof (mask_t) * 8 - 1)); }
   mask_t mask;
 };