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

[instancer/CFF2] Fixups

Browse Source
This commit is contained in:
Behdad Esfahbod 2024-05-14 11:11:39 -06:00
parent 385c2cb979
commit 1891a7220d
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Lib/fontTools/cffLib/__init__.py
View File

@ -2132,9 +2132,6 @@ class FDSelectCompiler(object):
class VarStoreCompiler(object): class VarStoreCompiler(object):
def __init__(self, varStoreData, parent): def __init__(self, varStoreData, parent):
self.parent = parent self.parent = parent
if varStoreData is None:
self.data = b""
return
if not varStoreData.data: if not varStoreData.data:
varStoreData.compile() varStoreData.compile()
data = [packCard16(len(varStoreData.data)), varStoreData.data] data = [packCard16(len(varStoreData.data)), varStoreData.data]

10
Lib/fontTools/varLib/instancer/__init__.py
View File

@ -593,9 +593,7 @@ def instantiateCFF2(
) # Who knows why it's in two places?! ) # Who knows why it's in two places?!
def getNumRegions(vsindex): def getNumRegions(vsindex):
return len( return varStore.VarData[vsindex if vsindex is not None else 0].VarRegionCount
varStore.VarData[vsindex if vsindex is not None else 0].VarRegionIndex
)
charStrings = topDict.CharStrings.values() charStrings = topDict.CharStrings.values()
@ -791,10 +789,10 @@ def instantiateCFF2(
# Remove empty VarStore # Remove empty VarStore
if not varStore.VarData: if not varStore.VarData:
topDict.VarStore = None del topDict.VarStore
topDict.CharStrings.varStore = None del topDict.CharStrings.varStore
for private in privateDicts: for private in privateDicts:
private.vstore = None del private.vstore
def _instantiateGvarGlyph( def _instantiateGvarGlyph(