organicmaps/harfbuzz
13
Fork 0
mirror of https://github.com/harfbuzz/harfbuzz.git synced 2025-04-15 01:18:13 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

[instancer] bug fix: dont add duplicate rows into delta_row_encoding_t

Browse source 
Also fix compile_varidx_map()
This commit is contained in:
Qunxin Liu 2023-09-18 10:44:47 -07:00
parent 6c658b4105
commit 7741fa3299
1 changed files with 33 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
src/hb-ot-var-common.hh
View file

@ -1938,6 +1938,9 @@ struct item_variations_t
unsigned start_row = 0;
hb_vector_t<delta_row_encoding_t> encoding_objs;
hb_hashmap_t<hb_vector_t<uint8_t>, unsigned> chars_idx_map;
/* delta_rows map, used for filtering out duplicate rows */
hb_hashmap_t<const hb_vector_t<int>*, unsigned> delta_rows_map;
for (unsigned major = 0; major < vars.length; major++)
{
/* deltas are stored in tuples(column based), convert them back into items
@ -1980,8 +1983,17 @@ struct item_variations_t
if (all_zeros)
continue;
}
if (!front_mapping.set ((major<<16) + minor, &row))
return false;
hb_vector_t<uint8_t> chars = delta_row_encoding_t::get_row_chars (row);
if (!chars) return false;
if (delta_rows_map.has (&row))
continue;
delta_rows_map.set (&row, 1);
unsigned *obj_idx;
if (chars_idx_map.has (chars, &obj_idx))
{
@ -1996,8 +2008,6 @@ struct item_variations_t
if (!chars_idx_map.set (chars, encoding_objs.length - 1))
return false;
}
if (!front_mapping.set ((major<<16) + minor, &row))
return false;
}
start_row += num_rows;
@ -2090,35 +2100,34 @@ struct item_variations_t
/* sort again based on width, make result deterministic */
encodings.qsort (delta_row_encoding_t::cmp_width);
/* full encoding_row -> new VarIdxes mapping */
hb_hashmap_t<const hb_vector_t<int>*, unsigned> back_mapping;
for (unsigned major = 0; major < encodings.length; major++)
if (!compile_varidx_map (major, front_mapping, back_mapping))
return false;
return true;
return compile_varidx_map (front_mapping);
}
private:
/* compile varidx_map for one VarData subtable (index specified by major) */
bool compile_varidx_map (unsigned major,
const hb_hashmap_t<unsigned, const hb_vector_t<int>*>& front_mapping,
hb_hashmap_t<const hb_vector_t<int>*, unsigned> back_mapping)
bool compile_varidx_map (const hb_hashmap_t<unsigned, const hb_vector_t<int>*>& front_mapping)
{
delta_row_encoding_t& encoding = encodings[major];
/* just sanity check, this shouldn't happen */
if (encoding.is_empty ())
return false;
/* full encoding_row -> new VarIdxes mapping */
hb_hashmap_t<const hb_vector_t<int>*, unsigned> back_mapping;
unsigned num_rows = encoding.items.length;
/* sort rows, make result deterministic */
encoding.items.qsort (_cmp_row);
/* compile old to new var_idxes mapping */
for (unsigned minor = 0; minor < num_rows; minor++)
for (unsigned major = 0; major < encodings.length; major++)
{
unsigned new_varidx = (major << 16) + minor;
back_mapping.set (encoding.items.arrayZ[minor], new_varidx);
delta_row_encoding_t& encoding = encodings[major];
/* just sanity check, this shouldn't happen */
if (encoding.is_empty ())
return false;
unsigned num_rows = encoding.items.length;
/* sort rows, make result deterministic */
encoding.items.qsort (_cmp_row);
/* compile old to new var_idxes mapping */
for (unsigned minor = 0; minor < num_rows; minor++)
{
unsigned new_varidx = (major << 16) + minor;
back_mapping.set (encoding.items.arrayZ[minor], new_varidx);
}
}
for (auto _ : front_mapping.iter ())