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

[Behdad Esfahbod]

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

New commits:
commit d78463c8016ff1852233479a1ebde30c3bb6de6e
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Thu Jul 23 10:11:35 2015 +0100

    Minor debug output fix

diff --git a/src/hb-ot-layout.cc b/src/hb-ot-layout.cc
index 05ea060..5570a81 100644
--- a/src/hb-ot-layout.cc
+++ b/src/hb-ot-layout.cc
@@ -905,7 +905,7 @@ apply_backward (OT::hb_apply_context_t *c,
 
 struct hb_apply_forward_context_t
 {
-  inline const char *get_name (void) { return "APPLY_FORWARD"; }
+  inline const char *get_name (void) { return "APPLY_FWD"; }
   static const unsigned int max_debug_depth = HB_DEBUG_APPLY;
   typedef bool return_t;
   template <typename T, typename F>
commit d99f50bde0e8be0866385ca6886938d2023dbd4f
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Thu Jul 23 10:08:48 2015 +0100

    Add missing TRACE_RETURN

diff --git a/src/hb-ot-layout-gsubgpos-private.hh b/src/hb-ot-layout-gsubgpos-private.hh
index e14b5b6..5033a22 100644
--- a/src/hb-ot-layout-gsubgpos-private.hh
+++ b/src/hb-ot-layout-gsubgpos-private.hh
@@ -2164,7 +2164,7 @@ struct ExtensionFormat1
   {
     TRACE_DISPATCH (this, format);
     if (unlikely (!c->may_dispatch (this, this))) TRACE_RETURN (c->default_return_value ());
-    return get_subtable<typename T::LookupSubTable> ().dispatch (c, get_type ());
+    return TRACE_RETURN (get_subtable<typename T::LookupSubTable> ().dispatch (c, get_type ()));
   }
 
   /* This is called from may_dispatch() above with hb_sanitize_context_t. */
commit 2dc8e3f470d7c0b579f867605b8bf40688bc5722
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Thu Jul 23 10:07:21 2015 +0100

    [ot] Add missing return!

diff --git a/src/hb-ot-layout-gsubgpos-private.hh b/src/hb-ot-layout-gsubgpos-private.hh
index 99c4c83..e14b5b6 100644
--- a/src/hb-ot-layout-gsubgpos-private.hh
+++ b/src/hb-ot-layout-gsubgpos-private.hh
@@ -719,7 +719,7 @@ static inline bool match_input (hb_apply_context_t *c,
 {
   TRACE_APPLY (NULL);
 
-  if (unlikely (count > MAX_CONTEXT_LENGTH)) TRACE_RETURN (false);
+  if (unlikely (count > MAX_CONTEXT_LENGTH)) return TRACE_RETURN (false);
 
   hb_buffer_t *buffer = c->buffer;