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

[repacker] when calculating 16bit space size also consider ext lookup subtables.

This commit is contained in:
Garret Rieger 2022-07-25 20:11:24 +00:00
parent fa177b7f33
commit 0a5b69b255
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/hb-repacker.hh
View File

@ -93,11 +93,26 @@ bool _promote_extensions_if_needed (graph::make_extension_context_t& ext_context
size_t accumlated_bytes = size_t accumlated_bytes =
ext_context.graph.vertices_[ext_context.lookup_list_index].table_size (); ext_context.graph.vertices_[ext_context.lookup_list_index].table_size ();
// For the size of 16bit space, first add the size of all ext lookup subtables (as if all lookups
// were extensions).
for (auto p : lookup_sizes) for (auto p : lookup_sizes)
{ {
unsigned lookup_index = p.first; unsigned lookup_index = p.first;
accumlated_bytes += ext_context.lookups.get(lookup_index)->number_of_subtables () * 8;
}
for (auto p : lookup_sizes)
{
unsigned lookup_index = p.first;
const graph::Lookup* lookup = ext_context.lookups.get(lookup_index);
if (lookup->is_extension (ext_context.table_tag))
// already extension, size is counted by the loop above.
continue;
size_t size = p.second; size_t size = p.second;
accumlated_bytes += size; accumlated_bytes += size;
// will not be an extension lookup so subtract size counted in the above loop.
accumlated_bytes -= lookup->number_of_subtables () * 8;
if (accumlated_bytes < (1 << 16)) continue; // this lookup fits with 64k, which won't overflow. if (accumlated_bytes < (1 << 16)) continue; // this lookup fits with 64k, which won't overflow.