diff options
| author | Elliott Hughes <enh@google.com> | 2021-04-02 18:59:11 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-02 18:59:11 +0000 |
| commit | 78e33b81215ce3f9eff141df5eb171e107b4d315 (patch) | |
| tree | 8e925d800e27f7a70c2b6a131b14526bc0f095b5 /Lib/fontTools/ttLib/tables/_g_l_y_f.py | |
| parent | d350b6e23c78177a56f4f18831d9d78f4a30ce3f (diff) | |
| parent | d11d71b9408f76f20ef05bc09f69127d138d9a65 (diff) | |
| download | fonttools-78e33b81215ce3f9eff141df5eb171e107b4d315.tar.gz | |
Upgrade fonttools to 4.22.0 am: 6cf80b8fa7 am: d11d71b940
Original change: https://android-review.googlesource.com/c/platform/external/fonttools/+/1662591
Change-Id: I658fdb81cfb90b7929346bb21f6847c4059d46b9
Diffstat (limited to 'Lib/fontTools/ttLib/tables/_g_l_y_f.py')
| -rw-r--r-- | Lib/fontTools/ttLib/tables/_g_l_y_f.py | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/Lib/fontTools/ttLib/tables/_g_l_y_f.py b/Lib/fontTools/ttLib/tables/_g_l_y_f.py index e12969e4..4680ddbf 100644 --- a/Lib/fontTools/ttLib/tables/_g_l_y_f.py +++ b/Lib/fontTools/ttLib/tables/_g_l_y_f.py @@ -1,7 +1,7 @@ """_g_l_y_f.py -- Converter classes for the 'glyf' table.""" from collections import namedtuple -from fontTools.misc.py23 import * +from fontTools.misc.py23 import bytechr, byteord, bytesjoin, tostr from fontTools.misc import sstruct from fontTools import ttLib from fontTools import version @@ -152,7 +152,7 @@ class table__g_l_y_f(DefaultTable.DefaultTable): if glyph.numberOfContours: if splitGlyphs: glyphPath = userNameToFileName( - tounicode(glyphName, 'utf-8'), + tostr(glyphName, 'utf-8'), existingGlyphFiles, prefix=path + ".", suffix=ext) @@ -1506,12 +1506,12 @@ class GlyphCoordinates(object): p = self._checkFloat(p) self._a.extend(p) - def toInt(self): + def toInt(self, *, round=otRound): if not self.isFloat(): return a = array.array("h") for n in self._a: - a.append(otRound(n)) + a.append(round(n)) self._a = a def relativeToAbsolute(self): @@ -1626,13 +1626,9 @@ class GlyphCoordinates(object): for i in range(len(a)): a[i] = -a[i] return r - def __round__(self): - """ - Note: This is Python 3 only. Python 2 does not call __round__. - As such, we cannot test this method either. :( - """ + def __round__(self, *, round=otRound): r = self.copy() - r.toInt() + r.toInt(round=round) return r def __add__(self, other): return self.copy().__iadd__(other) |