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

[GX] Align signature of decompileCoord() with that of similar methods

Browse Source
This commit is contained in:
Sascha Brawer 2015-04-27 13:10:38 +02:00
parent 5352ceb824
commit e0bd569a73
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Lib/fontTools/ttLib/tables/_g_v_a_r.py
View File

@ -74,21 +74,19 @@ class table__g_v_a_r(DefaultTable.DefaultTable):
def decompileSharedCoords_(self, axisTags, data):
result = []
pos = self.offsetToCoord
stride = len(axisTags) * 2
for i in xrange(self.sharedCoordCount):
coord = self.decompileCoord_(axisTags, data[pos:pos+stride])
coord, pos = self.decompileCoord_(axisTags, data, pos)
result.append(coord)
pos += stride
return result
@staticmethod
def decompileCoord_(axisTags, data):
def decompileCoord_(axisTags, data, offset):
coord = {}
pos = 0
pos = offset
for axis in axisTags:
coord[axis] = fixedToFloat(struct.unpack(b">h", data[pos:pos+2])[0], 14)
pos += 2
return coord
return coord, pos
@staticmethod
def decompileOffsets_(data, format, glyphCount):
@ -175,14 +173,11 @@ class table__g_v_a_r(DefaultTable.DefaultTable):
if (flags & EMBEDDED_TUPLE_COORD) == 0:
coord = sharedCoords[flags & TUPLE_INDEX_MASK]
else:
coord = table__g_v_a_r.decompileCoord_(axisTags, data[pos:pos+coordSize])
pos += coordSize
coord, pos = table__g_v_a_r.decompileCoord_(axisTags, data, pos)
minCoord = maxCoord = coord
if (flags & INTERMEDIATE_TUPLE) != 0:
minCoord = table__g_v_a_r.decompileCoord_(axisTags, data[pos:pos+coordSize])
pos += coordSize
maxCoord = table__g_v_a_r.decompileCoord_(axisTags, data[pos:pos+coordSize])
pos += coordSize
minCoord, pos = table__g_v_a_r.decompileCoord_(axisTags, data, pos)
maxCoord, pos = table__g_v_a_r.decompileCoord_(axisTags, data, pos)
axes = {}
for axis in axisTags:
coords = minCoord[axis], coord[axis], maxCoord[axis]

5
Lib/fontTools/ttLib/tables/_g_v_a_r_test.py
View File

@ -57,6 +57,11 @@ class GlyphVariationTableTest(unittest.TestCase):
self.assertEqual((hexdecode("00 00 00 00 00 00 00 04 CA FE BE EF"), 1),
table__g_v_a_r.compileOffsets_([0, 4, 0xCAFEBEEF]))
def test_decompileCoord(self):
decompileCoord = table__g_v_a_r.decompileCoord_
data = hexdecode("DE AD C0 00 20 00 DE AD")
self.assertEqual(({"wght": -1.0, "wdth": 0.5}, 6), decompileCoord(["wght", "wdth"], data, 2))
def test_decompileSharedCoords(self):
table = table__g_v_a_r()
table.offsetToCoord = 4