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

[instancer] Remove redundant checks

Browse Source
This commit is contained in:
Behdad Esfahbod 2022-08-22 16:00:08 -06:00
parent e2a875b26c
commit 3108e52a90
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Lib/fontTools/varLib/instancer/__init__.py
View File

@ -871,16 +871,24 @@ def instantiateAvar(varfont, axisLimits):
)
newMapping = {}
for fromCoord, toCoord in mapping.items():
if fromCoord < axisRange.minimum or fromCoord > axisRange.maximum:
continue
fromCoord = normalizeValue(
fromCoord, (axisRange.minimum, 0, axisRange.maximum)
)
assert mappedMin <= toCoord <= mappedMax
toCoord = normalizeValue(toCoord, (mappedMin, 0, mappedMax))
if fromCoord < 0:
if fromCoord < axisRange.minimum:
continue
else:
fromCoord /= abs(axisRange.minimum)
elif fromCoord > 0:
if fromCoord > axisRange.maximum:
continue
else:
fromCoord /= axisRange.maximum
if toCoord < 0:
assert mappedMin != 0
assert toCoord >= mappedMin
toCoord /= abs(mappedMin)
elif toCoord > 0:
assert mappedMax != 0
assert toCoord <= mappedMax
toCoord /= mappedMax
fromCoord = floatToFixedToFloat(fromCoord, 14)
toCoord = floatToFixedToFloat(toCoord, 14)
newMapping[fromCoord] = toCoord