From f73d6f2a6f6cdbf5c47992af58e9ac00e974fff4 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Tue, 19 Dec 2023 17:02:05 -0700 Subject: [PATCH] [VARC] Fixups --- Lib/fontTools/ttLib/tables/otTables.py | 4 ++-- Lib/fontTools/ttLib/ttGlyphSet.py | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Lib/fontTools/ttLib/tables/otTables.py b/Lib/fontTools/ttLib/tables/otTables.py index 4e073bac7..944ac696b 100644 --- a/Lib/fontTools/ttLib/tables/otTables.py +++ b/Lib/fontTools/ttLib/tables/otTables.py @@ -186,7 +186,7 @@ class VarTransform: v = str2fl(safeEval(attrs[attr_name]), mapping.fractionalBits) setattr(self.transform, attr_name, v) - def applyDeltas(deltas): + def applyDeltas(self, deltas): i = 0 def read_transform_component_delta(data, values): @@ -199,7 +199,7 @@ class VarTransform: return 0 for attr_name, mapping_values in VAR_TRANSFORM_MAPPING.items(): - value = read_transform_component_delta(data, mapping_values) + value = read_transform_component_delta(deltas, mapping_values) setattr( self.transform, attr_name, getattr(self.transform, attr_name) + value ) diff --git a/Lib/fontTools/ttLib/ttGlyphSet.py b/Lib/fontTools/ttLib/ttGlyphSet.py index d5107236b..f3772d118 100644 --- a/Lib/fontTools/ttLib/ttGlyphSet.py +++ b/Lib/fontTools/ttLib/ttGlyphSet.py @@ -6,7 +6,7 @@ from contextlib import contextmanager from copy import copy from types import SimpleNamespace from fontTools.misc.vector import Vector -from fontTools.misc.fixedTools import otRound +from fontTools.misc.fixedTools import otRound, fixedToFloat as fi2fl from fontTools.misc.loggingTools import deprecateFunction from fontTools.misc.transform import Transform, DecomposedTransform from fontTools.pens.transformPen import TransformPen, TransformPointPen @@ -312,8 +312,9 @@ class _TTGlyphVARC(_TTGlyph): axisValues = ( axisValues + instancer[varIdx] ) # TODO Implement __iadd__ for Vector + assert len(axisIndices) == len(axisValues), (len(axisIndices), len(axisValues)) location = { - fvarAxes[i].axisTag: v for i, v in zip(axisIndices, axisValues) + fvarAxes[i].axisTag: fi2fl(v, 14) for i, v in zip(axisIndices, axisValues) } transform = DecomposedTransform()