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

[subset-perf] Remove extra map lookup in ClassDef subset methods.

This commit is contained in:
Garret Rieger 2022-05-18 23:32:03 +00:00 committed by Behdad Esfahbod
parent 13ace77f1d
commit 0b1c2ff96a
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/hb-ot-layout-common.hh
View File

@ -1978,22 +1978,22 @@ struct ClassDefFormat1
hb_codepoint_t start = startGlyph; hb_codepoint_t start = startGlyph;
hb_codepoint_t end = start + classValue.len; hb_codepoint_t end = start + classValue.len;
for (const hb_codepoint_t gid : + hb_range (start, end) for (const hb_codepoint_t gid : + hb_range (start, end))
| hb_filter (glyph_map))
{ {
hb_codepoint_t new_gid = glyph_map[gid];
if (new_gid == HB_MAP_VALUE_INVALID) continue;
if (glyph_filter && !glyph_filter->has(gid)) continue; if (glyph_filter && !glyph_filter->has(gid)) continue;
unsigned klass = classValue[gid - start]; unsigned klass = classValue[gid - start];
if (!klass) continue; if (!klass) continue;
hb_codepoint_t new_gid = glyph_map[gid];
glyphs.push (new_gid); glyphs.push (new_gid);
gid_org_klass_map.set (new_gid, klass); gid_org_klass_map.set (new_gid, klass);
orig_klasses.add (klass); orig_klasses.add (klass);
} }
unsigned glyph_count = glyph_filter unsigned glyph_count = glyph_filter
? hb_len (hb_iter (glyph_map.keys ()) | hb_filter (glyph_filter)) ? hb_len (hb_iter (glyph_map.keys()) | hb_filter (glyph_filter))
: glyph_map.get_population (); : glyph_map.get_population ();
use_class_zero = use_class_zero && glyph_count <= gid_org_klass_map.get_population (); use_class_zero = use_class_zero && glyph_count <= gid_org_klass_map.get_population ();
ClassDef_remap_and_serialize (c->serializer, gid_org_klass_map, ClassDef_remap_and_serialize (c->serializer, gid_org_klass_map,
@ -2216,18 +2216,19 @@ struct ClassDefFormat2
hb_codepoint_t end = rangeRecord[i].last + 1; hb_codepoint_t end = rangeRecord[i].last + 1;
for (hb_codepoint_t g = start; g < end; g++) for (hb_codepoint_t g = start; g < end; g++)
{ {
if (!glyph_map.has (g)) continue; hb_codepoint_t new_gid = glyph_map[g];
if (new_gid == HB_MAP_VALUE_INVALID) continue;
if (glyph_filter && !glyph_filter->has (g)) continue; if (glyph_filter && !glyph_filter->has (g)) continue;
unsigned new_gid = glyph_map[g];
glyphs.push (new_gid); glyphs.push (new_gid);
gid_org_klass_map.set (new_gid, klass); gid_org_klass_map.set (new_gid, klass);
orig_klasses.add (klass); orig_klasses.add (klass);
} }
} }
const hb_set_t& glyphset = *c->plan->glyphset_gsub ();
unsigned glyph_count = glyph_filter unsigned glyph_count = glyph_filter
? hb_len (hb_iter (glyph_map.keys ()) | hb_filter (glyph_filter)) ? hb_len (hb_iter (glyphset) | hb_filter (glyph_filter))
: glyph_map.get_population (); : glyph_map.get_population ();
use_class_zero = use_class_zero && glyph_count <= gid_org_klass_map.get_population (); use_class_zero = use_class_zero && glyph_count <= gid_org_klass_map.get_population ();
ClassDef_remap_and_serialize (c->serializer, gid_org_klass_map, ClassDef_remap_and_serialize (c->serializer, gid_org_klass_map,