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

[subset-input] Minor format

This commit is contained in:
Behdad Esfahbod 2021-08-25 16:25:08 -06:00
parent 18b4aab652
commit 1620698bd5
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -240,12 +240,13 @@ _populate_unicodes_to_retain (const hb_set_t *unicodes,
{ {
OT::cmap::accelerator_t cmap; OT::cmap::accelerator_t cmap;
cmap.init (plan->source); cmap.init (plan->source);
constexpr static const int size_threshold = 4000;
if (unicodes->get_population () < size_threshold && glyphs->is_empty ()) constexpr static const int size_threshold = 4096;
if (glyphs->is_empty () && unicodes->get_population () < size_threshold)
{ {
// This is the fast path if it's anticipated that size of unicodes /* This is the fast path if it's anticipated that size of unicodes
// is << than the number of codepoints in the font. * is << than the number of codepoints in the font. */
for (hb_codepoint_t cp : *unicodes) for (hb_codepoint_t cp : *unicodes)
{ {
hb_codepoint_t gid; hb_codepoint_t gid;
@ -257,34 +258,37 @@ _populate_unicodes_to_retain (const hb_set_t *unicodes,
plan->codepoint_to_glyph->set (cp, gid); plan->codepoint_to_glyph->set (cp, gid);
} }
cmap.fini (); }
} else { else
{
hb_map_t unicode_glyphid_map; hb_map_t unicode_glyphid_map;
cmap.collect_mapping (hb_set_get_empty (), &unicode_glyphid_map); cmap.collect_mapping (hb_set_get_empty (), &unicode_glyphid_map);
cmap.fini ();
for (hb_pair_t<hb_codepoint_t, hb_codepoint_t> cp_gid : for (hb_pair_t<hb_codepoint_t, hb_codepoint_t> cp_gid :
+ unicode_glyphid_map.iter ()) + unicode_glyphid_map.iter ())
{ {
if (!unicodes->has (cp_gid.first) && !glyphs->has (cp_gid.second)) if (!unicodes->has (cp_gid.first) && !glyphs->has (cp_gid.second))
continue; continue;
plan->codepoint_to_glyph->set (cp_gid.first, cp_gid.second); plan->codepoint_to_glyph->set (cp_gid.first, cp_gid.second);
} }
// Add gids which where requested, but not mapped in cmap /* Add gids which where requested, but not mapped in cmap */
// TODO(garretrieger): once https://github.com/harfbuzz/harfbuzz/issues/3169 // TODO(garretrieger):
// is implemented, this can be done with union and del_range // Once https://github.com/harfbuzz/harfbuzz/issues/3169
// is implemented, this can be done with union and del_range
for (hb_codepoint_t gid : glyphs->iter ()) for (hb_codepoint_t gid : glyphs->iter ())
{ {
if (gid >= plan->source->get_num_glyphs ()) if (gid >= plan->source->get_num_glyphs ())
break; break;
plan->_glyphset_gsub->add (gid); plan->_glyphset_gsub->add (gid);
} }
} }
+ plan->codepoint_to_glyph->keys () | hb_sink (plan->unicodes); + plan->codepoint_to_glyph->keys () | hb_sink (plan->unicodes);
+ plan->codepoint_to_glyph->values () | hb_sink (plan->_glyphset_gsub); + plan->codepoint_to_glyph->values () | hb_sink (plan->_glyphset_gsub);
cmap.fini ();
} }
static void static void