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

[ttc] Implement object-sharing in TTC loading if sharedTables=True

Browse Source
This commit is contained in:
Behdad Esfahbod 2018-01-22 19:07:35 -08:00
parent 233e46ca38
commit 22c971aa99
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,7 +67,8 @@ class TTFont(object):
def __init__(self, file=None, res_name_or_index=None,
sfntVersion="\000\001\000\000", flavor=None, checkChecksums=False,
verbose=None, recalcBBoxes=True, allowVID=False, ignoreDecompileErrors=False,
recalcTimestamp=True, fontNumber=-1, lazy=None, quiet=None):
recalcTimestamp=True, fontNumber=-1, lazy=None, quiet=None,
_tableCache=None):
"""The constructor can be called with a few different arguments.
When reading a font from disk, 'file' should be either a pathname
@ -182,7 +183,8 @@ class TTFont(object):
if closeStream:
file.close()
file = tmp
self.reader = sfnt.SFNTReader(file, checkChecksums, fontNumber=fontNumber)
self.tableCache = _tableCache
self.reader = sfnt.SFNTReader(file, checkChecksums, fontNumber=fontNumber, tableCache=_tableCache)
self.sfntVersion = self.reader.sfntVersion
self.flavor = self.reader.flavor
self.flavorData = self.reader.flavorData
@ -421,6 +423,11 @@ class TTFont(object):
import traceback
log.debug("Reading '%s' table from disk", tag)
data = self.reader[tag]
dataHash = hash(data) # Oops, sorry if collides!
if self.tableCache is not None:
table = self.tableCache.get((Tag(tag), dataHash))
if table is not None:
return table
tableClass = getTableClass(tag)
table = tableClass(tag)
self.tables[tag] = table
@ -440,6 +447,8 @@ class TTFont(object):
table.ERROR = file.getvalue()
self.tables[tag] = table
table.decompile(data, self)
if self.tableCache is not None:
self.tableCache[(Tag(tag), dataHash)] = table
return table
else:
raise KeyError("'%s' table not found" % tag)
@ -1033,7 +1042,7 @@ class TTCollection(object):
accessed. This means that simple operations can be extremely fast.
"""
def __init__(self, file=None, **kwargs):
def __init__(self, file=None, shareTables=False, **kwargs):
fonts = self.fonts = []
if file is None:
return
@ -1047,10 +1056,12 @@ class TTCollection(object):
# assume "file" is a readable file object
closeStream = False
tableCache = {} if shareTables else None
header = readTTCHeader(file)
for i in range(header.numFonts):
font = TTFont(file, fontNumber=i, **kwargs)
font = TTFont(file, fontNumber=i, _tableCache=tableCache, **kwargs)
fonts.append(font)
if closeStream:
if (not kwargs.get('lazy')) and closeStream:
file.close()

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

@ -41,9 +41,10 @@ class SFNTReader(object):
# return default object
return object.__new__(cls)
def __init__(self, file, checkChecksums=1, fontNumber=-1):
def __init__(self, file, checkChecksums=1, fontNumber=-1, tableCache=None):
self.file = file
self.checkChecksums = checkChecksums
self.tableCache = tableCache
self.flavor = None
self.flavorData = None
@ -104,7 +105,13 @@ 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.