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

[subset] Improve GSUB closure memoize algorithm

Browse Source 
Instead of memoizing the tuple of <lookup-idx,current-glyphs>, use a mapping of
lookup-idx->current-glyphs instead. Saves some work. Speeds up 5%ish on
NotoNastaliqUrdu-Regular.
This commit is contained in:
Behdad Esfahbod 2018-06-11 23:46:42 -04:00
parent 1eddd0dcd2
commit 40ca30a82b
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Lib/fontTools/subset/__init__.py
View File

@ -1153,9 +1153,13 @@ def closure_glyphs(self, s, cur_glyphs=None):
cur_glyphs = frozenset(s.glyphs)
# Memoize
if (id(self), cur_glyphs) in s._doneLookups:
key = id(self)
doneLookups = s._doneLookups
if cur_glyphs.issubset(doneLookups.get(key, {})):
return
s._doneLookups.add((id(self), cur_glyphs))
if key not in doneLookups:
doneLookups[key] = set()
doneLookups[key].update(cur_glyphs)
if self in s._activeLookups:
raise Exception("Circular loop in lookup recursion")
@ -1397,7 +1401,7 @@ def closure_glyphs(self, s):
while True:
orig_glyphs = frozenset(s.glyphs)
s._activeLookups = []
s._doneLookups = set()
s._doneLookups = {}
for i in lookup_indices:
if i >= self.table.LookupList.LookupCount: continue
if not self.table.LookupList.Lookup[i]: continue