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

Merge pull request #3562 from harfbuzz/subset-cmap-no-qsort 

[subset] In cmap planning, remove a qsort()
This commit is contained in:
Behdad Esfahbod 2022-05-04 16:49:45 -06:00 committed by GitHub
parent 052812b6ba 50db78ba83
commit 6829dd30ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/hb-subset-plan.cc
View File

@ -287,14 +287,6 @@ _remove_invalid_gids (hb_set_t *glyphs,
} }
} }
static inline int
_compare_cp_gid_pair (const void* a,
const void* b)
{
return ((hb_pair_t<hb_codepoint_t, hb_codepoint_t>*)a)->first -
((hb_pair_t<hb_codepoint_t, hb_codepoint_t>*)b)->first;
}
static void static void
_populate_unicodes_to_retain (const hb_set_t *unicodes, _populate_unicodes_to_retain (const hb_set_t *unicodes,
const hb_set_t *glyphs, const hb_set_t *glyphs,
@ -327,29 +319,27 @@ _populate_unicodes_to_retain (const hb_set_t *unicodes,
// This approach is slower, but can handle adding in glyphs to the subset and will match // This approach is slower, but can handle adding in glyphs to the subset and will match
// them with cmap entries. // them with cmap entries.
hb_map_t unicode_glyphid_map; hb_map_t unicode_glyphid_map;
cmap.collect_mapping (hb_set_get_empty (), &unicode_glyphid_map); hb_set_t cmap_unicodes;
cmap.collect_mapping (&cmap_unicodes, &unicode_glyphid_map);
plan->unicode_to_new_gid_list.alloc (hb_min(unicodes->get_population () plan->unicode_to_new_gid_list.alloc (hb_min(unicodes->get_population ()
+ glyphs->get_population (), + glyphs->get_population (),
unicode_glyphid_map.get_population ())); cmap_unicodes.get_population ()));
for (hb_codepoint_t cp : cmap_unicodes)
for (hb_pair_t<hb_codepoint_t, hb_codepoint_t> cp_gid :
+ unicode_glyphid_map.iter ())
{ {
if (!unicodes->has (cp_gid.first) && !glyphs->has (cp_gid.second)) hb_codepoint_t gid = unicode_glyphid_map[cp];
continue; if (!unicodes->has (cp) && !glyphs->has (gid))
continue;
plan->codepoint_to_glyph->set (cp_gid.first, cp_gid.second); plan->codepoint_to_glyph->set (cp, gid);
plan->unicode_to_new_gid_list.push (hb_pair (cp_gid.first, cp_gid.second)); plan->unicode_to_new_gid_list.push (hb_pair (cp, gid));
} }
plan->unicode_to_new_gid_list.qsort (_compare_cp_gid_pair);
/* Add gids which where requested, but not mapped in cmap */ /* Add gids which where requested, but not mapped in cmap */
// TODO(garretrieger): // TODO(garretrieger):
// Once https://github.com/harfbuzz/harfbuzz/issues/3169 // Once https://github.com/harfbuzz/harfbuzz/issues/3169
// is implemented, this can be done with union and del_range // is implemented, this can be done with union and del_range
for (hb_codepoint_t gid : glyphs->iter ()) for (hb_codepoint_t gid : *glyphs)
{ {
if (gid >= plan->source->get_num_glyphs ()) if (gid >= plan->source->get_num_glyphs ())
break; break;