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

[subset] don't free glyphs by range. 

The iterator in this loop is a map iterator so glyphs are not necessarily traveresed in order.
This commit is contained in:
Garret Rieger 2023-03-13 22:12:59 +00:00 committed by Behdad Esfahbod
parent 3d05b96181
commit 663ecc01d8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/OT/glyf/glyf.hh
View File

@ -131,7 +131,7 @@ struct glyf
bool result = glyf_prime->serialize (c->serializer, glyphs.writer (), use_short_loca, c->plan); bool result = glyf_prime->serialize (c->serializer, glyphs.writer (), use_short_loca, c->plan);
if (c->plan->normalized_coords && !c->plan->pinned_at_default) if (c->plan->normalized_coords && !c->plan->pinned_at_default)
_free_compiled_subset_glyphs (glyphs, glyphs.length - 1); _free_compiled_subset_glyphs (glyphs);
if (!result) return false; if (!result) return false;
@ -150,9 +150,9 @@ struct glyf
hb_font_t * hb_font_t *
_create_font_for_instancing (const hb_subset_plan_t *plan) const; _create_font_for_instancing (const hb_subset_plan_t *plan) const;
void _free_compiled_subset_glyphs (hb_vector_t<glyf_impl::SubsetGlyph> &glyphs, unsigned index) const void _free_compiled_subset_glyphs (hb_vector_t<glyf_impl::SubsetGlyph> &glyphs) const
{ {
for (unsigned i = 0; i <= index && i < glyphs.length; i++) for (unsigned i = 0; i < glyphs.length; i++)
glyphs[i].free_compiled_bytes (); glyphs[i].free_compiled_bytes ();
} }
@ -452,7 +452,7 @@ glyf::_populate_subset_glyphs (const hb_subset_plan_t *plan,
{ {
// when pinned at default, only bounds are updated, thus no need to free // when pinned at default, only bounds are updated, thus no need to free
if (!plan->pinned_at_default) if (!plan->pinned_at_default)
_free_compiled_subset_glyphs (glyphs, new_gid); _free_compiled_subset_glyphs (glyphs);
return false; return false;
} }
} }