Skip to content

Commit

Permalink
[instancer/avar2] Minor speedup
Browse files Browse the repository at this point in the history
  • Loading branch information
behdad committed Apr 19, 2024
1 parent 119967b commit 9f992fc
Showing 1 changed file with 11 additions and 9 deletions.
20 changes: 11 additions & 9 deletions Lib/fontTools/varLib/instancer/avar.py
Expand Up @@ -17,14 +17,16 @@ def VarStore_getExtremes(self, varIdx, nullAxes=set(), cache=None):
return cache[key]

Check warning on line 17 in Lib/fontTools/varLib/instancer/avar.py

View check run for this annotation

Codecov / codecov/patch

Lib/fontTools/varLib/instancer/avar.py#L17

Added line #L17 was not covered by tests

regionList = self.VarRegionList

Check warning on line 19 in Lib/fontTools/varLib/instancer/avar.py

View check run for this annotation

Codecov / codecov/patch

Lib/fontTools/varLib/instancer/avar.py#L19

Added line #L19 was not covered by tests
fvar_axes = []
for i in range(regionList.RegionAxisCount):
axis = Axis()
axis.axisTag = str(i)
axis.minValue = -1.0
axis.defaultValue = 0.0
axis.maxValue = 1.0
fvar_axes.append(axis)

if not hasattr(self, "_fvar_axes"):
self._fvar_axes = []

Check warning on line 22 in Lib/fontTools/varLib/instancer/avar.py

View check run for this annotation

Codecov / codecov/patch

Lib/fontTools/varLib/instancer/avar.py#L22

Added line #L22 was not covered by tests
for i in range(regionList.RegionAxisCount):
axis = Axis()
axis.axisTag = str(i)
axis.minValue = -1.0
axis.defaultValue = 0.0
axis.maxValue = 1.0
self._fvar_axes.append(axis)

Check warning on line 29 in Lib/fontTools/varLib/instancer/avar.py

View check run for this annotation

Codecov / codecov/patch

Lib/fontTools/varLib/instancer/avar.py#L24-L29

Added lines #L24 - L29 were not covered by tests

major = varIdx >> 16
minor = varIdx & 0xFFFF
Expand All @@ -49,7 +51,7 @@ def VarStore_getExtremes(self, varIdx, nullAxes=set(), cache=None):
location[str(i)] = peak

Check warning on line 51 in Lib/fontTools/varLib/instancer/avar.py

View check run for this annotation

Codecov / codecov/patch

Lib/fontTools/varLib/instancer/avar.py#L48-L51

Added lines #L48 - L51 were not covered by tests
if skip:
continue
varStoreInstancer = VarStoreInstancer(varStore, fvar_axes, location)
varStoreInstancer = VarStoreInstancer(varStore, self._fvar_axes, location)
v = varStoreInstancer[varIdx]

Check warning on line 55 in Lib/fontTools/varLib/instancer/avar.py

View check run for this annotation

Codecov / codecov/patch

Lib/fontTools/varLib/instancer/avar.py#L53-L55

Added lines #L53 - L55 were not covered by tests

assert thisAxes, "Empty region in VarStore!"
Expand Down

0 comments on commit 9f992fc

Please sign in to comment.