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

[instancer] bug fix for COLRv1, add missing mapping to VarIdx::NO_VARIATION

Browse source
This commit is contained in:
Qunxin Liu 2024-05-08 10:11:03 -07:00 • committed by Behdad Esfahbod
parent b74a7ecc93
commit 7975c9cabd
9 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/hb-subset-plan.cc
View file

@ -527,11 +527,20 @@ _remap_colrv1_delta_set_index_indices (const OT::DeltaSetIndexMap &index_map,
for (unsigned delta_set_idx : delta_set_idxes)
{
unsigned var_idx = index_map.map (delta_set_idx);
hb_pair_t<unsigned, int> *new_varidx_delta;
if (!variation_idx_delta_map.has (var_idx, &new_varidx_delta)) continue;
unsigned new_varidx = HB_OT_LAYOUT_NO_VARIATIONS_INDEX;
int delta = 0;
if (var_idx != HB_OT_LAYOUT_NO_VARIATIONS_INDEX)
{
hb_pair_t<unsigned, int> *new_varidx_delta;
if (!variation_idx_delta_map.has (var_idx, &new_varidx_delta)) continue;
new_deltaset_idx_varidx_map.set (new_delta_set_idx, hb_first (*new_varidx_delta));
delta_set_idx_delta_map.set (delta_set_idx, hb_pair_t<unsigned, int> (new_delta_set_idx, hb_second (*new_varidx_delta)));
new_varidx = hb_first (*new_varidx_delta);
delta = hb_second (*new_varidx_delta);
}
new_deltaset_idx_varidx_map.set (new_delta_set_idx, new_varidx);
delta_set_idx_delta_map.set (delta_set_idx, hb_pair_t<unsigned, int> (new_delta_set_idx, delta));
new_delta_set_idx++;
}
variation_idx_delta_map = std::move (delta_set_idx_delta_map);

BIN
test/subset/data/expected/instantiate_colrv1/Foldit.default.41.wght=300-600.ttf Normal file
View file

Binary file not shown.

BIN
test/subset/data/expected/instantiate_colrv1/Foldit.default.41.wght=900.ttf Normal file
View file

Binary file not shown.

BIN
test/subset/data/expected/instantiate_colrv1/KalniaGlaze.default.41.wght=300-600.ttf Normal file
View file

Binary file not shown.

BIN
test/subset/data/expected/instantiate_colrv1/KalniaGlaze.default.41.wght=900.ttf Normal file
View file

Binary file not shown.

BIN
test/subset/data/expected/instantiate_colrv1/KalniaGlaze.default.all.wght=300-600.ttf Normal file
View file

Binary file not shown.

BIN
test/subset/data/expected/instantiate_colrv1/KalniaGlaze.default.all.wght=900.ttf Normal file
View file

Binary file not shown.

BIN
test/subset/data/fonts/KalniaGlaze.ttf Normal file
View file

Binary file not shown.

2
test/subset/data/tests/instantiate_colrv1.tests
View file

@ -1,10 +1,12 @@
FONTS:
Foldit.ttf
KalniaGlaze.ttf
PROFILES:
default.txt
SUBSETS:
A
*
INSTANCES: