shadowfacts/fonttools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

varLib: simplify a bit following varStore.py recent changes

Browse Source 
#2662
This commit is contained in:
Cosimo Lupo 2022-06-24 10:20:48 +01:00
parent fcd2a67f52
commit 7ab7940761
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/fontTools/varLib/__init__.py
View File

@ -719,11 +719,9 @@ def _add_COLR(font, model, master_fonts, axisTags, colr_layer_reuse=True):
store = merger.store_builder.finish() store = merger.store_builder.finish()
colr = font["COLR"].table colr = font["COLR"].table
if store.VarData: if store:
mapping = store.optimize() mapping = store.optimize()
colr.VarStore = store colr.VarStore = store
# the special 0xFFFF/0xFFFF (for no variations) always maps to itself
mapping[ot.NO_VARIATION_INDEX] = ot.NO_VARIATION_INDEX
varIdxes = [mapping[v] for v in merger.varIdxes] varIdxes = [mapping[v] for v in merger.varIdxes]
# TODO: Optimize reusable runs of delta-set indices from multiple paints # TODO: Optimize reusable runs of delta-set indices from multiple paints
colr.VarIndexMap = builder.buildDeltaSetIndexMap(varIdxes) colr.VarIndexMap = builder.buildDeltaSetIndexMap(varIdxes)

2
Lib/fontTools/varLib/varStore.py
View File

@ -7,7 +7,7 @@ from functools import partial
from collections import defaultdict from collections import defaultdict
NO_VARIATION_INDEX = 0xFFFFFFFF NO_VARIATION_INDEX = ot.NO_VARIATION_INDEX
ot.VarStore.NO_VARIATION_INDEX = NO_VARIATION_INDEX ot.VarStore.NO_VARIATION_INDEX = NO_VARIATION_INDEX