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

[glyf] Move add_gid_and_children to glyf table

This commit is contained in:
Ebrahim Byagowi 2019-10-08 13:46:55 +03:30
parent c7621cf211
commit be0eddd418
2 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/hb-ot-glyf-table.hh
View File

@ -1008,6 +1008,20 @@ struct glyf
return glyph_header.bytes_without_padding (glyph_bytes);
}
void
add_gid_and_children (hb_codepoint_t gid, hb_set_t *gids_to_retain) const
{
/* Check if is already visited */
if (gids_to_retain->has (gid)) return;
gids_to_retain->add (gid);
hb_bytes_t glyph_bytes = bytes_for_glyph (gid);
const GlyphHeader &glyph_header = *glyph_bytes.as<GlyphHeader> ();
for (auto &item : glyph_header.get_composite_iterator (glyph_bytes))
add_gid_and_children (item.glyphIndex, gids_to_retain);
}
private:
bool short_offset;
unsigned int num_glyphs;

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

@ -34,23 +34,6 @@
#include "hb-ot-var-fvar-table.hh"
#include "hb-ot-stat-table.hh"
static inline void
_add_gid_and_children (const OT::glyf::accelerator_t &glyf,
hb_codepoint_t gid,
hb_set_t *gids_to_retain)
{
if (gids_to_retain->has (gid))
// Already visited this gid, ignore.
return;
gids_to_retain->add (gid);
hb_bytes_t glyph_bytes = glyf.bytes_for_glyph (gid);
const OT::glyf::GlyphHeader &glyph_header = *glyph_bytes.as<OT::glyf::GlyphHeader> ();
for (auto &item : glyph_header.get_composite_iterator (glyph_bytes))
_add_gid_and_children (glyf, item.glyphIndex, gids_to_retain);
}
#ifndef HB_NO_SUBSET_CFF
static inline void
_add_cff_seac_components (const OT::cff1::accelerator_t &cff,
@ -147,7 +130,7 @@ _populate_gids_to_retain (hb_subset_plan_t* plan,
hb_codepoint_t gid = HB_SET_VALUE_INVALID;
while (plan->_glyphset_gsub->next (&gid))
{
_add_gid_and_children (glyf, gid, plan->_glyphset);
glyf.add_gid_and_children (gid, plan->_glyphset);
#ifndef HB_NO_SUBSET_CFF
if (cff.is_valid ())
_add_cff_seac_components (cff, gid, plan->_glyphset);