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

avoid calling getCompiledSize_ twice

Browse Source
This commit is contained in:
Cosimo Lupo 2024-02-06 12:24:11 +00:00
parent 4d3d8c5aba
commit 3975ce6339
No known key found for this signature in database
GPG Key ID: DF65A8A5A119C9A8
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Lib/fontTools/otlLib/builder.py
View File

@ -409,22 +409,23 @@ class ChainContextualBuilder(LookupBuilder):
if not ruleset.hasAnyGlyphClasses: if not ruleset.hasAnyGlyphClasses:
candidates[1] = [self.buildFormat1Subtable(ruleset, chaining)] candidates[1] = [self.buildFormat1Subtable(ruleset, chaining)]
candidates_by_size = []
for i in [1, 2, 3]: for i in [1, 2, 3]:
if candidates[i]: if candidates[i]:
try: try:
self.getCompiledSize_(candidates[i]) size = self.getCompiledSize_(candidates[i])
except OTLOffsetOverflowError as e: except OTLOffsetOverflowError as e:
log.warning( log.warning(
"Contextual format %i at %s overflowed (%s)" "Contextual format %i at %s overflowed (%s)"
% (i, str(self.location), e) % (i, str(self.location), e)
) )
candidates[i] = None else:
candidates_by_size.append((size, candidates[i]))
candidates = [x for x in candidates if x is not None] if not candidates_by_size:
if not candidates:
raise OpenTypeLibError("All candidates overflowed", self.location) raise OpenTypeLibError("All candidates overflowed", self.location)
winner = min(candidates, key=self.getCompiledSize_) _min_size, winner = min(candidates_by_size, key=lambda x: x[0])
subtables.extend(winner) subtables.extend(winner)
# If we are not chaining, lookup type will be automatically fixed by # If we are not chaining, lookup type will be automatically fixed by