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

[Behdad Esfahbod]

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

New commits:
commit fecdfa95daf4916695f23e7dab89ab363be11b89
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Sun Oct 7 17:19:58 2012 -0400

    Fixup hb_ot_shape_closure()
    
    Broke it when merged cmap mapping and normalizer.  Ouch!

diff --git a/src/hb-ot-shape.cc b/src/hb-ot-shape.cc
index 3f72fd0..313766a 100644
--- a/src/hb-ot-shape.cc
+++ b/src/hb-ot-shape.cc
@@ -589,7 +589,7 @@ hb_ot_map_glyphs_dumb (hb_font_t    *font,
 {
   unsigned int count = buffer->len;
   for (unsigned int i = 0; i < count; i++)
-    font->get_glyph (buffer->cur().codepoint, 0, &buffer->cur().codepoint);
+    font->get_glyph (buffer->info[i].codepoint, 0, &buffer->info[i].codepoint);
 }
 
 void
commit 2d1dcb3ce3354c2d5e2b4d1d291beb8d23cdea22
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Sun Oct 7 17:13:46 2012 -0400

    Mark debug message functions static

diff --git a/src/hb-private.hh b/src/hb-private.hh
index 43b6e8a..42c0259 100644
--- a/src/hb-private.hh
+++ b/src/hb-private.hh
@@ -546,7 +546,7 @@ _hb_debug (unsigned int level,
 #define DEBUG_LEVEL(WHAT, LEVEL) (_hb_debug ((LEVEL), HB_DEBUG_##WHAT))
 #define DEBUG(WHAT) (DEBUG_LEVEL (WHAT, 0))
 
-template <int max_level> inline void
+template <int max_level> static inline void
 _hb_debug_msg_va (const char *what,
 		  const void *obj,
 		  const char *func,
@@ -608,7 +608,7 @@ _hb_debug_msg_va<0> (const char *what HB_UNUSED,
 		     const char *message HB_UNUSED,
 		     va_list ap HB_UNUSED) {}
 
-template <int max_level> inline void
+template <int max_level> static inline void
 _hb_debug_msg (const char *what,
 	       const void *obj,
 	       const char *func,
@@ -617,7 +617,7 @@ _hb_debug_msg (const char *what,
 	       int level_dir,
 	       const char *message,
 	       ...) HB_PRINTF_FUNC(7, 8);
-template <int max_level> inline void
+template <int max_level> static inline void
 _hb_debug_msg (const char *what,
 	       const void *obj,
 	       const char *func,