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

[ttc] Drop tableCache from SFNTReader

Browse Source 
We just need it in TTFont layer itself.
This commit is contained in:
Behdad Esfahbod 2018-01-23 13:44:32 -08:00
parent 1c25445e7b
commit 3635926341
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/fontTools/ttLib/__init__.py
View File

@ -184,7 +184,7 @@ class TTFont(object):
file.close()
file = tmp
self.tableCache = _tableCache
self.reader = sfnt.SFNTReader(file, checkChecksums, fontNumber=fontNumber, tableCache=_tableCache)
self.reader = sfnt.SFNTReader(file, checkChecksums, fontNumber=fontNumber)
self.sfntVersion = self.reader.sfntVersion
self.flavor = self.reader.flavor
self.flavorData = self.reader.flavorData

9
Lib/fontTools/ttLib/sfnt.py
View File

@ -41,10 +41,9 @@ class SFNTReader(object):
# return default object
return object.__new__(cls)
def __init__(self, file, checkChecksums=1, fontNumber=-1, tableCache=None):
def __init__(self, file, checkChecksums=1, fontNumber=-1):
self.file = file
self.checkChecksums = checkChecksums
self.tableCache = tableCache
self.flavor = None
self.flavorData = None
@ -105,13 +104,7 @@ class SFNTReader(object):
def __getitem__(self, tag):
"""Fetch the raw table data."""
entry = self.tables[Tag(tag)]
if self.tableCache is not None:
data = self.tableCache.get((Tag(tag), entry.offset))
if data is not None:
return data
data = entry.loadData (self.file)
if self.tableCache is not None:
self.tableCache[(Tag(tag), entry.offset)] = data
if self.checkChecksums:
if tag == 'head':
# Beh: we have to special-case the 'head' table.