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

[varStore] Fix caching when setModel() is called repeatedly

Browse Source
This commit is contained in:
Behdad Esfahbod 2023-12-15 15:45:05 -07:00
parent 02c6a94529
commit 6bcab786a1
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Lib/fontTools/varLib/varStore.py
View File

@ -32,7 +32,7 @@ class OnlineVarStoreBuilder(object):
self._supports = None self._supports = None
self._varDataIndices = {} self._varDataIndices = {}
self._varDataCaches = {} self._varDataCaches = {}
self._cache = {} self._cache = None
def setModel(self, model): def setModel(self, model):
self.setSupports(model.supports) self.setSupports(model.supports)
@ -43,7 +43,7 @@ class OnlineVarStoreBuilder(object):
self._supports = list(supports) self._supports = list(supports)
if not self._supports[0]: if not self._supports[0]:
del self._supports[0] # Drop base master support del self._supports[0] # Drop base master support
self._cache = {} self._cache = None
self._data = None self._data = None
def finish(self, optimize=True): def finish(self, optimize=True):
@ -110,12 +110,13 @@ class OnlineVarStoreBuilder(object):
assert len(deltas) == len(self._supports) assert len(deltas) == len(self._supports)
deltas = tuple(deltas) deltas = tuple(deltas)
if not self._data:
self._add_VarData()
varIdx = self._cache.get(deltas) varIdx = self._cache.get(deltas)
if varIdx is not None: if varIdx is not None:
return varIdx return varIdx
if not self._data:
self._add_VarData()
inner = len(self._data.Item) inner = len(self._data.Item)
if inner == 0xFFFF: if inner == 0xFFFF:
# Full array. Start new one. # Full array. Start new one.
@ -131,12 +132,13 @@ class OnlineVarStoreBuilder(object):
deltas_list = [[round(d) for d in deltas] for deltas in deltas_list] deltas_list = [[round(d) for d in deltas] for deltas in deltas_list]
deltas_list = tuple(tuple(deltas) for deltas in deltas_list) deltas_list = tuple(tuple(deltas) for deltas in deltas_list)
if not self._data:
self._add_VarData(len(deltas_list))
varIdx = self._cache.get(deltas_list) varIdx = self._cache.get(deltas_list)
if varIdx is not None: if varIdx is not None:
return varIdx return varIdx
if not self._data:
self._add_VarData(len(deltas_list))
inner = len(self._data.Item) inner = len(self._data.Item)
if inner + len(deltas_list) > 0xFFFF: if inner + len(deltas_list) > 0xFFFF:
# Full array. Start new one. # Full array. Start new one.