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

[varLib.interpolatable] Speed up m0idx finding

Browse Source 
Don't use list.index() which would compare vectors...
This commit is contained in:
Behdad Esfahbod 2023-10-14 17:25:52 -04:00
parent d29856b2e4
commit 4714c37028
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Lib/fontTools/varLib/interpolatable.py
View File

@ -260,11 +260,9 @@ def test(glyphsets, glyphs=None, names=None, ignore_missing=False):
) )
# m0idx should be the index of the first non-None item in allNodeTypes, # m0idx should be the index of the first non-None item in allNodeTypes,
# else give it the first index of None, which is likely 0 # else give it the last item.
m0idx = allNodeTypes.index( m0idx = next((i for i,x in enumerate(allNodeTypes) if x is not None), len(allNodeTypes) - 1)
next((x for x in allNodeTypes if x is not None), None) # m0 is the first non-None item in allNodeTypes, or last one if all None
)
# m0 is the first non-None item in allNodeTypes, or the first item if all are None
m0 = allNodeTypes[m0idx] m0 = allNodeTypes[m0idx]
for i, m1 in enumerate(allNodeTypes[m0idx + 1 :]): for i, m1 in enumerate(allNodeTypes[m0idx + 1 :]):
if m1 is None: if m1 is None:
@ -315,11 +313,9 @@ def test(glyphsets, glyphs=None, names=None, ignore_missing=False):
continue continue
# m0idx should be the index of the first non-None item in allVectors, # m0idx should be the index of the first non-None item in allVectors,
# else give it the first index of None, which is likely 0 # else give it the last item.
m0idx = allVectors.index( m0idx = next((i for i,x in enumerate(allVectors) if x is not None), len(allVectors) - 1)
next((x for x in allVectors if x is not None), None) # m0 is the first non-None item in allVectors, or last one if all None
)
# m0 is the first non-None item in allVectors, or the first item if all are None
m0 = allVectors[m0idx] m0 = allVectors[m0idx]
if m0: if m0:
for i, m1 in enumerate(allVectors[m0idx + 1 :]): for i, m1 in enumerate(allVectors[m0idx + 1 :]):