walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Clear masks before setting them up, not after!

This commit is contained in:
Behdad Esfahbod 2010-10-12 17:00:07 -04:00
parent fd3d32d31c
commit 1e80782244
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/hb-ot-shape.cc
View File

@ -82,6 +82,8 @@ hb_ot_shape_collect_features (hb_ot_shape_plan_t *plan,
static void static void
hb_ot_shape_setup_masks (hb_ot_shape_context_t *c) hb_ot_shape_setup_masks (hb_ot_shape_context_t *c)
{ {
c->buffer->clear_masks ();
hb_mask_t global_mask = c->plan->map.get_global_mask (); hb_mask_t global_mask = c->plan->map.get_global_mask ();
if (global_mask) if (global_mask)
c->buffer->set_masks (global_mask, global_mask, 0, (unsigned int) -1); c->buffer->set_masks (global_mask, global_mask, 0, (unsigned int) -1);
@ -281,8 +283,6 @@ hb_ot_shape_execute_internal (hb_ot_shape_context_t *c)
/* SUBSTITUTE */ /* SUBSTITUTE */
{ {
c->buffer->clear_masks ();
/* Mirroring needs to see the original direction */ /* Mirroring needs to see the original direction */
hb_mirror_chars (c); hb_mirror_chars (c);
@ -298,8 +298,6 @@ hb_ot_shape_execute_internal (hb_ot_shape_context_t *c)
/* POSITION */ /* POSITION */
{ {
c->buffer->clear_masks ();
hb_position_default (c); hb_position_default (c);
hb_ot_position_complex (c); hb_ot_position_complex (c);