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

[repack] Don't count space isolation against round limit. 

Restore max rounds to 20 but don't count space isolation against the limit. The number of iterations space isolation can make changes for is already bounded to a reasonable max (the number of lookups in the font) so no need to cap the number of iterations.
This commit is contained in:
Garret Rieger 2022-07-13 22:55:58 +00:00 committed by Behdad Esfahbod
parent a2f0723148
commit 9c2518988d
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/hb-repacker.hh
View File

@ -157,7 +157,7 @@ template<typename T>
inline hb_blob_t* inline hb_blob_t*
hb_resolve_overflows (const T& packed, hb_resolve_overflows (const T& packed,
hb_tag_t table_tag, hb_tag_t table_tag,
unsigned max_rounds = 40) { unsigned max_rounds = 20) {
graph_t sorted_graph (packed); graph_t sorted_graph (packed);
sorted_graph.sort_shortest_distance (); sorted_graph.sort_shortest_distance ();
@ -181,7 +181,7 @@ hb_resolve_overflows (const T& packed,
// TODO(garretrieger): select a good limit for max rounds. // TODO(garretrieger): select a good limit for max rounds.
while (!sorted_graph.in_error () while (!sorted_graph.in_error ()
&& graph::will_overflow (sorted_graph, &overflows) && graph::will_overflow (sorted_graph, &overflows)
&& round++ < max_rounds) { && round < max_rounds) {
DEBUG_MSG (SUBSET_REPACK, nullptr, "=== Overflow resolution round %d ===", round); DEBUG_MSG (SUBSET_REPACK, nullptr, "=== Overflow resolution round %d ===", round);
print_overflows (sorted_graph, overflows); print_overflows (sorted_graph, overflows);
@ -189,6 +189,9 @@ hb_resolve_overflows (const T& packed,
if (!_try_isolating_subgraphs (overflows, sorted_graph)) if (!_try_isolating_subgraphs (overflows, sorted_graph))
{ {
// Don't count space isolation towards round limit. Only increment
// round counter if space isolation made no changes.
round++;
if (!_process_overflows (overflows, priority_bumped_parents, sorted_graph)) if (!_process_overflows (overflows, priority_bumped_parents, sorted_graph))
{ {
DEBUG_MSG (SUBSET_REPACK, nullptr, "No resolution available :("); DEBUG_MSG (SUBSET_REPACK, nullptr, "No resolution available :(");