python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-08-05 13:00:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge d78f7e82ec into 1e64e37104

Browse Source
This commit is contained in:
Martin Panter 2014-01-31 14:30:01 -08:00
commit dd47aff7e1
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
PIL/OleFileIO.py
View File

@ -112,7 +112,7 @@ class _OleStream(io.BytesIO):
data = b"".join(data) data = b"".join(data)
# print len(data), size # print(len(data), size)
io.BytesIO.__init__(self, data[:size]) io.BytesIO.__init__(self, data[:size])
@ -368,7 +368,7 @@ class OleFileIO:
self.root.dump() self.root.dump()
def _clsid(self, clsid): def _clsid(self, clsid):
if clsid == "\0" * len(clsid): if not clsid.strip(b"\0"):
return "" return ""
return (("%08X-%04X-%04X-%02X%02X-" + "%02X" * 6) % return (("%08X-%04X-%04X-%02X%02X-" + "%02X" * 6) %
((i32(clsid, 0), i16(clsid, 4), i16(clsid, 6)) + ((i32(clsid, 0), i16(clsid, 4), i16(clsid, 6)) +
@ -454,7 +454,7 @@ class OleFileIO:
fp.seek(i32(s, 16)) fp.seek(i32(s, 16))
# get section # get section
s = "****" + fp.read(i32(fp.read(4))-4) s = b"****" + fp.read(i32(fp.read(4))-4)
for i in range(i32(s, 4)): for i in range(i32(s, 4)):
@ -501,8 +501,8 @@ class OleFileIO:
# FIXME: add support for VT_VECTOR # FIXME: add support for VT_VECTOR
#print "%08x" % id, repr(value), #print("%08x" % id, repr(value), end=" ")
#print "(%s)" % VT[i32(s, offset) & 0xFFF] #print("(%s)" % VT[i32(s, offset) & 0xFFF])
data[id] = value data[id] = value