glyf: use 'round' parameter in _getCoordinatesAndControls
as Behdad suggested in review
This commit is contained in:
parent
5c0f05cc42
commit
dfec4abf6d
@ -372,7 +372,7 @@ class table__g_l_y_f(DefaultTable.DefaultTable):
|
|||||||
]
|
]
|
||||||
|
|
||||||
def _getCoordinatesAndControls(
|
def _getCoordinatesAndControls(
|
||||||
self, glyphName, hMetrics, vMetrics=None, roundCoordinates=True
|
self, glyphName, hMetrics, vMetrics=None, *, round=otRound
|
||||||
):
|
):
|
||||||
"""Return glyph coordinates and controls as expected by "gvar" table.
|
"""Return glyph coordinates and controls as expected by "gvar" table.
|
||||||
|
|
||||||
@ -446,8 +446,7 @@ class table__g_l_y_f(DefaultTable.DefaultTable):
|
|||||||
# Add phantom points for (left, right, top, bottom) positions.
|
# Add phantom points for (left, right, top, bottom) positions.
|
||||||
phantomPoints = self._getPhantomPoints(glyphName, hMetrics, vMetrics)
|
phantomPoints = self._getPhantomPoints(glyphName, hMetrics, vMetrics)
|
||||||
coords.extend(phantomPoints)
|
coords.extend(phantomPoints)
|
||||||
if roundCoordinates:
|
coords.toInt(round=round)
|
||||||
coords.toInt()
|
|
||||||
return coords, controls
|
return coords, controls
|
||||||
|
|
||||||
def _setCoordinates(self, glyphName, coord, hMetrics, vMetrics=None):
|
def _setCoordinates(self, glyphName, coord, hMetrics, vMetrics=None):
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
from fontTools.misc.fixedTools import floatToFixedToFloat
|
from fontTools.misc.fixedTools import floatToFixedToFloat
|
||||||
|
from fontTools.misc.roundTools import noRound
|
||||||
from fontTools.misc.testTools import stripVariableItemsFromTTX
|
from fontTools.misc.testTools import stripVariableItemsFromTTX
|
||||||
from fontTools.misc.textTools import Tag
|
from fontTools.misc.textTools import Tag
|
||||||
from fontTools import ttLib
|
from fontTools import ttLib
|
||||||
@ -57,7 +58,7 @@ def _get_coordinates(varfont, glyphname):
|
|||||||
varfont["hmtx"].metrics,
|
varfont["hmtx"].metrics,
|
||||||
varfont["vmtx"].metrics,
|
varfont["vmtx"].metrics,
|
||||||
# the tests expect float coordinates
|
# the tests expect float coordinates
|
||||||
roundCoordinates=False,
|
round=noRound,
|
||||||
)[0]
|
)[0]
|
||||||
)
|
)
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user