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

[interpolatable] Speed up by removing unused data

Browse Source
This commit is contained in:
Behdad Esfahbod 2023-12-14 11:04:23 -07:00
parent 57fbc6ca8f
commit 71f7515ef5
1 changed files with 4 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Lib/fontTools/varLib/interpolatable.py
View File

@ -39,11 +39,9 @@ DEFAULT_UPEM = 1000
class Glyph:
ITEMS = (
"recordings",
"recordingsNormalized",
"greenStats",
"controlStats",
"greenVectors",
"greenVectorsNormalized",
"controlVectors",
"nodeTypes",
"isomorphisms",
@ -95,21 +93,6 @@ class Glyph:
self.greenVectors.append(contour_vector_from_stats(greenStats))
self.controlVectors.append(contour_vector_from_stats(controlStats))
# Save a "normalized" version of the outlines
try:
rpen = DecomposingRecordingPen(glyphset)
tpen = TransformPen(
rpen, transform_from_stats(greenStats, inverse=True)
)
contour.replay(tpen)
self.recordingsNormalized.append(rpen)
except ZeroDivisionError:
self.recordingsNormalized.append(None)
greenStats = StatisticsPen(glyphset=glyphset)
rpen.replay(greenStats)
self.greenVectorsNormalized.append(contour_vector_from_stats(greenStats))
# Check starting point
if nodeTypes[0] == "addComponent":
self._fill_in(ix)
@ -316,12 +299,8 @@ def test_gen(
m1Isomorphisms = glyph1.isomorphisms
m0Vectors = glyph0.greenVectors
m1Vectors = glyph1.greenVectors
m0VectorsNormalized = glyph0.greenVectorsNormalized
m1VectorsNormalized = glyph1.greenVectorsNormalized
recording0 = glyph0.recordings
recording1 = glyph1.recordings
recording0Normalized = glyph0.recordingsNormalized
recording1Normalized = glyph1.recordingsNormalized
# If contour-order is wrong, adjust it
matching = matchings[m1idx]
@ -330,9 +309,7 @@ def test_gen(
): # m1 is empty for composite glyphs
m1Isomorphisms = [m1Isomorphisms[i] for i in matching]
m1Vectors = [m1Vectors[i] for i in matching]
m1VectorsNormalized = [m1VectorsNormalized[i] for i in matching]
recording1 = [recording1[i] for i in matching]
recording1Normalized = [recording1Normalized[i] for i in matching]
midRecording = []
for c0, c1 in zip(recording0, recording1):
@ -387,22 +364,14 @@ def test_gen(
# self-intersecting contour; ignore it.
contour = midRecording[ix]
normalized = False
if contour and (m0Vectors[ix][0] < 0) == (m1Vectors[ix][0] < 0):
if normalized:
midStats = StatisticsPen(glyphset=None)
tpen = TransformPen(
midStats, transform_from_stats(midStats, inverse=True)
)
contour.replay(tpen)
else:
midStats = StatisticsPen(glyphset=None)
contour.replay(midStats)
midVector = contour_vector_from_stats(midStats)
m0Vec = m0Vectors[ix] if not normalized else m0VectorsNormalized[ix]
m1Vec = m1Vectors[ix] if not normalized else m1VectorsNormalized[ix]
m0Vec = m0Vectors[ix]
m1Vec = m1Vectors[ix]
size0 = m0Vec[0] * m0Vec[0]
size1 = m1Vec[0] * m1Vec[0]
midSize = midVector[0] * midVector[0]