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

[OTLayout] Fix feature iteration in collect_lookups 

Previous logic was just wrong.
This commit is contained in:
Behdad Esfahbod 2013-01-03 00:04:40 -06:00
parent 733e8c0d7b
commit 15e9e4e1dd
1 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/hb-ot-layout.cc
View File

@ -447,17 +447,30 @@ _hb_ot_layout_collect_lookups_features (hb_face_t *face,
if (!features) if (!features)
{ {
/* All features */ /* All features */
unsigned int count = hb_ot_layout_language_get_feature_tags (face, unsigned int feature_indices[32];
unsigned int offset, len;
offset = 0;
do {
len = ARRAY_LENGTH (feature_indices);
hb_ot_layout_language_get_feature_indexes (face,
table_tag, table_tag,
script_index, script_index,
language_index, language_index,
0, NULL, NULL); offset, &len,
for (unsigned int feature_index = 0; feature_index < count; feature_index++) feature_indices);
for (unsigned int i = 0; i < len; i++)
_hb_ot_layout_collect_lookups_lookups (face, _hb_ot_layout_collect_lookups_lookups (face,
table_tag, table_tag,
feature_index, feature_indices[i],
lookup_indexes); lookup_indexes);
} else {
offset += len;
} while (len == ARRAY_LENGTH (feature_indices));
}
else
{
for (; *features; features++) for (; *features; features++)
{ {
unsigned int feature_index; unsigned int feature_index;
@ -497,7 +510,9 @@ _hb_ot_layout_collect_lookups_languages (hb_face_t *face,
language_index, language_index,
features, features,
lookup_indexes); lookup_indexes);
} else { }
else
{
for (; *languages; languages++) for (; *languages; languages++)
{ {
unsigned int language_index; unsigned int language_index;
@ -537,7 +552,9 @@ hb_ot_layout_collect_lookups (hb_face_t *face,
languages, languages,
features, features,
lookup_indexes); lookup_indexes);
} else { }
else
{
for (; *scripts; scripts++) for (; *scripts; scripts++)
{ {
unsigned int script_index; unsigned int script_index;
@ -572,7 +589,8 @@ hb_ot_layout_lookup_collect_glyphs (hb_face_t *face,
glyphs_after, glyphs_after,
glyphs_output); glyphs_output);
switch (table_tag) { switch (table_tag)
{
case HB_OT_TAG_GSUB: case HB_OT_TAG_GSUB:
{ {
const OT::SubstLookup& l = hb_ot_layout_from_face (face)->gsub->get_lookup (lookup_index); const OT::SubstLookup& l = hb_ot_layout_from_face (face)->gsub->get_lookup (lookup_index);