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

[instancer.solver] Fix negative -2 case

Browse Source
This commit is contained in:
Behdad Esfahbod 2022-08-09 14:59:12 -06:00
parent d3e0a39362
commit 53b6c4c9fe
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Lib/fontTools/varLib/instancer/solver.py
View File

@ -7,7 +7,7 @@ __all__ = ['rebaseTent']
def _reverse_negate(v): def _reverse_negate(v):
return (-v[2], -v[1], -v[0]) return (-v[2], -v[1], -v[0])
def _solve(tent, axisLimit): def _solve(tent, axisLimit, negative=False):
axisMin, axisDef, axisMax = axisLimit axisMin, axisDef, axisMax = axisLimit
lower, peak, upper = tent lower, peak, upper = tent
@ -15,7 +15,7 @@ def _solve(tent, axisLimit):
if axisDef > peak: if axisDef > peak:
return [(scalar, _reverse_negate(t) if t is not None else None) return [(scalar, _reverse_negate(t) if t is not None else None)
for scalar,t for scalar,t
in _solve(_reverse_negate(tent), _reverse_negate(axisLimit))] in _solve(_reverse_negate(tent), _reverse_negate(axisLimit), not negative)]
# axisDef <= peak # axisDef <= peak
# case 1: The whole deltaset falls outside the new limit; we can drop it # case 1: The whole deltaset falls outside the new limit; we can drop it
@ -159,7 +159,7 @@ def _solve(tent, axisLimit):
# #
elif axisDef + (axisMax - axisDef) * 2 >= upper: elif axisDef + (axisMax - axisDef) * 2 >= upper:
if axisDef + (axisMax - axisDef) * MAX_F2DOT14 < upper: if not negative and axisDef + (axisMax - axisDef) * MAX_F2DOT14 < upper:
# we clamp +2.0 to the max F2Dot14 (~1.99994) for convenience # we clamp +2.0 to the max F2Dot14 (~1.99994) for convenience
upper = axisDef + (axisMax - axisDef) * MAX_F2DOT14 upper = axisDef + (axisMax - axisDef) * MAX_F2DOT14