[HarfBuzz] harfbuzz: Branch 'master'

[Behdad Esfahbod]

 src/hb-ot-layout-gsubgpos-private.hh |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 1ea375da446bf68f705a70ce4a480db9fb9d13f3
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Sat Nov 24 02:05:52 2012 -0500

    [OTLayout] Only collect output glyphs during recursion in collect_glyphs()

diff --git a/src/hb-ot-layout-gsubgpos-private.hh b/src/hb-ot-layout-gsubgpos-private.hh
index 51ae9b5..d51ee01 100644
--- a/src/hb-ot-layout-gsubgpos-private.hh
+++ b/src/hb-ot-layout-gsubgpos-private.hh
@@ -158,7 +158,9 @@ struct hb_collect_glyphs_context_t
       return default_return_value ();
 
     nesting_level_left--;
-    recurse_func (this, lookup_index);
+    /* Only collect output glyphs in the recursion. */
+    hb_collect_glyphs_context_t new_c (this->face, NULL, NULL, NULL, &output, nesting_level_left);
+    recurse_func (&new_c, lookup_index);
     nesting_level_left++;
     return default_return_value ();
   }