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

[>64k:glyf] Hid composite glyphIndex

This commit is contained in:
Behdad Esfahbod 2022-07-11 15:08:22 -06:00
parent df7eebf40a
commit 09de94788b
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/OT/glyf/CompositeGlyph.hh
View File

@ -145,6 +145,10 @@ struct CompositeGlyphRecord
} }
public: public:
hb_codepoint_t get_gid () const { return glyphIndex; }
void set_gid (hb_codepoint_t gid) { glyphIndex = gid; }
protected:
HBUINT16 flags; HBUINT16 flags;
HBGlyphID16 glyphIndex; HBGlyphID16 glyphIndex;
public: public:

2
src/OT/glyf/Glyph.hh
View File

@ -146,7 +146,7 @@ struct Glyph
for (auto &item : get_composite_iterator ()) for (auto &item : get_composite_iterator ())
{ {
comp_points.reset (); comp_points.reset ();
if (unlikely (!glyf_accelerator.glyph_for_gid (item.glyphIndex) if (unlikely (!glyf_accelerator.glyph_for_gid (item.get_gid ())
.get_points (font, glyf_accelerator, comp_points, .get_points (font, glyf_accelerator, comp_points,
phantom_only, depth + 1))) phantom_only, depth + 1)))
return false; return false;

4
src/OT/glyf/SubsetGlyph.hh
View File

@ -42,8 +42,8 @@ struct SubsetGlyph
for (auto &_ : Glyph (dest_glyph).get_composite_iterator ()) for (auto &_ : Glyph (dest_glyph).get_composite_iterator ())
{ {
hb_codepoint_t new_gid; hb_codepoint_t new_gid;
if (plan->new_gid_for_old_gid (_.glyphIndex, &new_gid)) if (plan->new_gid_for_old_gid (_.get_gid(), &new_gid))
const_cast<CompositeGlyphRecord &> (_).glyphIndex = new_gid; const_cast<CompositeGlyphRecord &> (_).set_gid (new_gid);
} }
if (plan->flags & HB_SUBSET_FLAGS_NO_HINTING) if (plan->flags & HB_SUBSET_FLAGS_NO_HINTING)

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

@ -439,7 +439,7 @@ _glyf_add_gid_and_children (const OT::glyf_accelerator_t &glyf,
for (auto item : glyf.glyph_for_gid (gid).get_composite_iterator ()) for (auto item : glyf.glyph_for_gid (gid).get_composite_iterator ())
operation_count = operation_count =
_glyf_add_gid_and_children (glyf, _glyf_add_gid_and_children (glyf,
item.glyphIndex, item.get_gid (),
gids_to_retain, gids_to_retain,
operation_count, operation_count,
depth); depth);