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

Move some more code around

This commit is contained in:
Behdad Esfahbod 2010-10-07 21:21:11 -04:00
parent d9c7260788
commit 5360ce0c5c
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -249,20 +249,6 @@ hb_ot_shape_setup_lookups (hb_ot_shape_context_t *c,
lookup_map *lookups, lookup_map *lookups,
unsigned int *num_lookups) unsigned int *num_lookups)
{ {
unsigned int script_index, language_index, feature_index;
unsigned int room_lookups;
room_lookups = *num_lookups;
*num_lookups = 0;
hb_ot_layout_table_choose_script (c->face, c->table_tag,
hb_ot_tags_from_script (c->buffer->props.script),
&script_index);
hb_ot_layout_script_find_language (c->face, c->table_tag, script_index,
hb_ot_tag_from_language (c->buffer->props.language),
&language_index);
hb_mask_allocator_t allocator; hb_mask_allocator_t allocator;
switch (c->original_direction) { switch (c->original_direction) {
@ -292,11 +278,24 @@ hb_ot_shape_setup_lookups (hb_ot_shape_context_t *c,
/* Compile features */ /* Compile features */
unsigned int script_index, language_index, feature_index;
unsigned int room_lookups;
hb_ot_layout_table_choose_script (c->face, c->table_tag,
hb_ot_tags_from_script (c->buffer->props.script),
&script_index);
hb_ot_layout_script_find_language (c->face, c->table_tag, script_index,
hb_ot_tag_from_language (c->buffer->props.language),
&language_index);
allocator.compile (c->face, c->table_tag, script_index, language_index); allocator.compile (c->face, c->table_tag, script_index, language_index);
/* Gather lookup indices for features */ /* Gather lookup indices for features */
room_lookups = *num_lookups;
*num_lookups = 0;
if (hb_ot_layout_language_get_required_feature_index (c->face, c->table_tag, script_index, language_index, if (hb_ot_layout_language_get_required_feature_index (c->face, c->table_tag, script_index, language_index,
&feature_index)) &feature_index))
add_lookups (c->face, c->table_tag, feature_index, 1, lookups, num_lookups, room_lookups); add_lookups (c->face, c->table_tag, feature_index, 1, lookups, num_lookups, room_lookups);