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

[avar2] First stab at mapping v2 values

This commit is contained in:
Behdad Esfahbod 2022-06-28 17:10:10 -06:00
parent c3eb6713e9
commit 2a877b554a
1 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/hb-ot-var-avar-table.hh
View File

@ -156,7 +156,7 @@ struct avar
if (version.major == 2) if (version.major == 2)
{ {
auto *v2 = (const avarV2Tail *) map; const auto *v2 = (const avarV2Tail *) map;
if (unlikely (!v2->sanitize (c, this))) if (unlikely (!v2->sanitize (c, this)))
return_trace (false); return_trace (false);
} }
@ -174,6 +174,32 @@ struct avar
coords[i] = map->map (coords[i]); coords[i] = map->map (coords[i]);
map = &StructAfter<SegmentMaps> (*map); map = &StructAfter<SegmentMaps> (*map);
} }
if (version.major < 2)
return;
/* TODO Use cache. */
/* XXX Out coords might have different size; in varIdxMap. */
const auto *v2 = (const avarV2Tail *) map;
const auto &varidx_map = this+v2->varIdxMap;
const auto &var_store = this+v2->varStore;
hb_vector_t<int> out;
for (unsigned i = 0; i < coords_length; i++)
{
int v = coords[i];
uint32_t varidx = varidx_map.map (i);
float delta = var_store.get_delta (varidx, coords, coords_length);
v += round (delta);
/* TODO Clamp v? */
out.push (v);
}
for (unsigned i = 0; i < coords_length; i++)
coords[i] = out[i];
} }
void unmap_coords (int *coords, unsigned int coords_length) const void unmap_coords (int *coords, unsigned int coords_length) const