[HarfBuzz] harfbuzz: Branch 'master'

[Behdad Esfahbod]

 src/hb-ot-shape-complex-use.cc |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 862b1644e9469a7e70555141f53729409d50d0d2
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Fri Dec 18 13:54:06 2015 +0000

    [use] Only set syllable-based topographical features if not Arabic-joining

diff --git a/src/hb-ot-shape-complex-use.cc b/src/hb-ot-shape-complex-use.cc
index 3e7003a..0f66783 100644
--- a/src/hb-ot-shape-complex-use.cc
+++ b/src/hb-ot-shape-complex-use.cc
@@ -285,6 +285,9 @@ static void
 setup_topographical_masks (const hb_ot_shape_plan_t *plan,
 			   hb_buffer_t *buffer)
 {
+  const use_shape_plan_t *use_plan = (const use_shape_plan_t *) plan->data;
+  if (use_plan->arabic_plan)
+    return;
 
   ASSERT_STATIC (INIT < 4 && ISOL < 4 && MEDI < 4 && FINA < 4);
   hb_mask_t masks[4], all_masks = 0;