From 2118fdb9f584e6735e904638e48bae48314372fa Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Tue, 2 Aug 2011 14:06:51 -0400 Subject: [PATCH] Fix fallback shaping Broke it a few commits ago. --- src/hb-ot-shape.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/hb-ot-shape.cc b/src/hb-ot-shape.cc index e40cf1e08..9f41b2939 100644 --- a/src/hb-ot-shape.cc +++ b/src/hb-ot-shape.cc @@ -235,12 +235,13 @@ hb_substitute_default (hb_ot_shape_context_t *c) static void hb_ot_substitute_complex (hb_ot_shape_context_t *c) { - if (hb_ot_layout_has_substitution (c->face)) + if (hb_ot_layout_has_substitution (c->face)) { c->plan->map.substitute (c->face, c->buffer); + c->applied_substitute_complex = TRUE; + } hb_ot_layout_substitute_finish (c->buffer); - c->applied_substitute_complex = TRUE; return; } @@ -295,11 +296,12 @@ hb_ot_position_complex (hb_ot_shape_context_t *c) &c->buffer->pos[i].x_offset, &c->buffer->pos[i].y_offset); } + + c->applied_position_complex = TRUE; } hb_ot_layout_position_finish (c->buffer); - c->applied_position_complex = TRUE; return; }