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

[hmtx] Remove other subset-specific method from hmtx accelerator

This commit is contained in:
Behdad Esfahbod 2022-02-12 14:18:02 -06:00
parent 9ba520b5d1
commit 42b119edb5
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/hb-ot-hmtx-table.hh
View File

@ -128,7 +128,19 @@ struct hmtxvmtx
if (unlikely (!table_prime)) return_trace (false); if (unlikely (!table_prime)) return_trace (false);
accelerator_t _mtx (c->plan->source); accelerator_t _mtx (c->plan->source);
unsigned num_advances = _mtx.num_advances_for_subset (c->plan); unsigned num_advances;
{
/* Determine num_advances to encode. */
auto& plan = c->plan;
num_advances = plan->num_output_glyphs ();
hb_codepoint_t old_gid = 0;
unsigned int last_advance = plan->old_gid_for_new_gid (num_advances - 1, &old_gid) ? _mtx.get_advance (old_gid) : 0;
while (num_advances > 1 &&
last_advance == (plan->old_gid_for_new_gid (num_advances - 2, &old_gid) ? _mtx.get_advance (old_gid) : 0))
{
num_advances--;
}
}
auto it = auto it =
+ hb_range (c->plan->num_output_glyphs ()) + hb_range (c->plan->num_output_glyphs ())
@ -259,20 +271,6 @@ struct hmtxvmtx
#endif #endif
} }
unsigned int num_advances_for_subset (const hb_subset_plan_t *plan) const
{
unsigned int num_advances = plan->num_output_glyphs ();
hb_codepoint_t old_gid = 0;
unsigned int last_advance = plan->old_gid_for_new_gid (num_advances - 1, &old_gid) ? get_advance (old_gid) : 0;
while (num_advances > 1 &&
last_advance == (plan->old_gid_for_new_gid (num_advances - 2, &old_gid) ? get_advance (old_gid) : 0))
{
num_advances--;
}
return num_advances;
}
protected: protected:
unsigned int num_metrics; unsigned int num_metrics;
unsigned int num_advances; unsigned int num_advances;