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

Merge pull request #1728 from silnrsi/bugfix3

Browse Source 
py3 fixup Silf corner case where script is actually used
This commit is contained in:
Cosimo Lupo 2019-09-26 11:59:15 +01:00 committed by GitHub
commit c4deb6caab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Lib/fontTools/ttLib/tables/S__i_l_f.py
View File

@ -400,7 +400,7 @@ class Silf(object):
data = data[self.numCritFeatures * 2 + 1:] data = data[self.numCritFeatures * 2 + 1:]
(numScriptTag,) = struct.unpack_from('B', data) (numScriptTag,) = struct.unpack_from('B', data)
if numScriptTag: if numScriptTag:
self.scriptTags = [struct.unpack("4s", data[x:x+4])[0] for x in range(1, 1 + 4 * numScriptTag, 4)] self.scriptTags = [struct.unpack("4s", data[x:x+4])[0].decode("ascii") for x in range(1, 1 + 4 * numScriptTag, 4)]
data = data[1 + 4 * numScriptTag:] data = data[1 + 4 * numScriptTag:]
(self.lbGID,) = struct.unpack('>H', data[:2]) (self.lbGID,) = struct.unpack('>H', data[:2])
if self.numPasses: if self.numPasses:
@ -446,8 +446,8 @@ class Silf(object):
data += struct.pack((">%dH" % self.numCritFeaturs), *self.critFeatures) data += struct.pack((">%dH" % self.numCritFeaturs), *self.critFeatures)
data += struct.pack("BB", 0, len(self.scriptTags)) data += struct.pack("BB", 0, len(self.scriptTags))
if len(self.scriptTags): if len(self.scriptTags):
tdata = [struct.pack("4s", x) for x in self.scriptTags] tdata = [struct.pack("4s", x.encode("ascii")) for x in self.scriptTags]
data += "".join(tdata) data += b"".join(tdata)
data += struct.pack(">H", self.lbGID) data += struct.pack(">H", self.lbGID)
self.passOffset = len(data) self.passOffset = len(data)