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

[subset-perf] Use glyph_map instead of set in ClassDefFormat.

This commit is contained in:
Garret Rieger 2022-05-18 22:38:43 +00:00 committed by Behdad Esfahbod
parent adae2f2272
commit 13ace77f1d
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1969,8 +1969,7 @@ struct ClassDefFormat1
const Coverage* glyph_filter = nullptr) const const Coverage* glyph_filter = nullptr) const
{ {
TRACE_SUBSET (this); TRACE_SUBSET (this);
const hb_set_t &glyphset = *c->plan->glyphset_gsub (); const hb_map_t &glyph_map = *c->plan->glyph_map_gsub;
const hb_map_t &glyph_map = *c->plan->glyph_map;
hb_sorted_vector_t<HBGlyphID16> glyphs; hb_sorted_vector_t<HBGlyphID16> glyphs;
hb_set_t orig_klasses; hb_set_t orig_klasses;
@ -1980,21 +1979,22 @@ struct ClassDefFormat1
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 (glyphset)) | hb_filter (glyph_map))
{ {
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;
glyphs.push (glyph_map[gid]); hb_codepoint_t new_gid = glyph_map[gid];
gid_org_klass_map.set (glyph_map[gid], klass); glyphs.push (new_gid);
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 (glyphset) | hb_filter (glyph_filter)) ? hb_len (hb_iter (glyph_map.keys ()) | hb_filter (glyph_filter))
: glyphset.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,
glyphs, orig_klasses, use_class_zero, klass_map); glyphs, orig_klasses, use_class_zero, klass_map);
@ -2201,8 +2201,7 @@ struct ClassDefFormat2
const Coverage* glyph_filter = nullptr) const const Coverage* glyph_filter = nullptr) const
{ {
TRACE_SUBSET (this); TRACE_SUBSET (this);
const hb_set_t &glyphset = *c->plan->glyphset_gsub (); const hb_map_t &glyph_map = *c->plan->glyph_map_gsub;
const hb_map_t &glyph_map = *c->plan->glyph_map;
hb_sorted_vector_t<HBGlyphID16> glyphs; hb_sorted_vector_t<HBGlyphID16> glyphs;
hb_set_t orig_klasses; hb_set_t orig_klasses;
@ -2217,17 +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 (!glyphset.has (g)) continue; if (!glyph_map.has (g)) continue;
if (glyph_filter && !glyph_filter->has (g)) continue; if (glyph_filter && !glyph_filter->has (g)) continue;
glyphs.push (glyph_map[g]);
gid_org_klass_map.set (glyph_map[g], klass); unsigned new_gid = glyph_map[g];
glyphs.push (new_gid);
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 (glyphset) | hb_filter (glyph_filter)) ? hb_len (hb_iter (glyph_map.keys ()) | hb_filter (glyph_filter))
: glyphset.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,
glyphs, orig_klasses, use_class_zero, klass_map); glyphs, orig_klasses, use_class_zero, klass_map);