From 9b37b4c5800b158f61602d2aba8a01349e24d251 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Mon, 12 Nov 2012 18:23:38 -0800 Subject: [PATCH] Make planner available to complex shaper choosing logic --- src/hb-ot-shape-complex-private.hh | 4 ++-- src/hb-ot-shape.cc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/hb-ot-shape-complex-private.hh b/src/hb-ot-shape-complex-private.hh index e3da44b53..c3e5ba521 100644 --- a/src/hb-ot-shape-complex-private.hh +++ b/src/hb-ot-shape-complex-private.hh @@ -115,9 +115,9 @@ HB_COMPLEX_SHAPERS_IMPLEMENT_SHAPERS static inline const hb_ot_complex_shaper_t * -hb_ot_shape_complex_categorize (const hb_segment_properties_t *props) +hb_ot_shape_complex_categorize (const hb_ot_shape_planner_t *planner) { - switch ((hb_tag_t) props->script) + switch ((hb_tag_t) planner->props.script) { default: return &_hb_ot_complex_shaper_default; diff --git a/src/hb-ot-shape.cc b/src/hb-ot-shape.cc index 9a6260a30..d168ae71d 100644 --- a/src/hb-ot-shape.cc +++ b/src/hb-ot-shape.cc @@ -175,7 +175,7 @@ _hb_ot_shaper_shape_plan_data_create (hb_shape_plan_t *shape_plan, hb_ot_shape_planner_t planner (shape_plan); - planner.shaper = hb_ot_shape_complex_categorize (&shape_plan->props); + planner.shaper = hb_ot_shape_complex_categorize (&planner); hb_ot_shape_collect_features (&planner, &shape_plan->props, user_features, num_user_features);