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

More separation

This commit is contained in:
Behdad Esfahbod 2010-10-08 20:38:46 -04:00
parent 6b7e675862
commit 52601275d5
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,15 +79,8 @@ hb_ot_shape_collect_features (hb_ot_shape_context_t *c)
static void static void
hb_ot_shape_setup_lookups (hb_ot_shape_context_t *c) hb_ot_shape_setup_masks (hb_ot_shape_context_t *c)
{ {
hb_ot_shape_collect_features (c);
/* Compile features */
c->map->compile (c);
/* Set masks in buffer */
hb_mask_t global_mask = c->map->get_global_mask (); hb_mask_t global_mask = c->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);
@ -278,7 +271,7 @@ hb_position_complex_fallback_visual (hb_ot_shape_context_t *c)
static void static void
hb_ot_shape_internal (hb_ot_shape_context_t *c) hb_ot_shape_internal (hb_ot_shape_context_t *c)
{ {
hb_ot_shape_setup_lookups (c); hb_ot_shape_setup_masks (c);
hb_form_clusters (c); hb_form_clusters (c);
@ -335,6 +328,9 @@ hb_ot_shape (hb_font_t *font,
c.original_direction = buffer->props.direction; c.original_direction = buffer->props.direction;
c.map = ↦ c.map = ↦
hb_ot_shape_collect_features (&c);
c.map->compile (&c);
hb_ot_shape_internal (&c); hb_ot_shape_internal (&c);
} }