mirror of
https://github.com/python-pillow/Pillow.git
synced 2024-11-10 19:56:47 +03:00
Loop cleanup, python 3 compatibility
This commit is contained in:
parent
3d185ee857
commit
31c204eae4
|
@ -28,6 +28,7 @@ import os
|
|||
__version__ = "0.3"
|
||||
|
||||
i8 = _binary.i8
|
||||
o8 = _binary.o8
|
||||
i16 = _binary.i16be
|
||||
|
||||
|
||||
|
@ -110,41 +111,37 @@ def _save(im, fp, filename):
|
|||
pinmin = 0
|
||||
# Maximum Byte value (255 = 8bits per pixel)
|
||||
pinmax = 255
|
||||
# Image name (79 characters max)
|
||||
imgName = os.path.splitext(os.path.basename(filename))[0][0:78]
|
||||
# Image name (79 characters max, truncated below in write)
|
||||
imgName = os.path.splitext(os.path.basename(filename))[0]
|
||||
if str is not bytes:
|
||||
imgName = imgName.encode('ascii', 'ignore')
|
||||
# Standard representation of pixel in the file
|
||||
colormap = 0
|
||||
channels = []
|
||||
for channelIndex in range(0, z):
|
||||
channelData = list(im.getdata(channelIndex))
|
||||
channels.append(channelData)
|
||||
fp.write(struct.pack('>h', magicNumber))
|
||||
fp.write(struct.pack('c', chr(rle)))
|
||||
fp.write(struct.pack('c', chr(bpc)))
|
||||
fp.write(o8(rle))
|
||||
fp.write(o8(bpc))
|
||||
fp.write(struct.pack('>H', dim))
|
||||
fp.write(struct.pack('>H', x))
|
||||
fp.write(struct.pack('>H', y))
|
||||
fp.write(struct.pack('>H', z))
|
||||
fp.write(struct.pack('>l', pinmin))
|
||||
fp.write(struct.pack('>l', pinmax))
|
||||
for i in range(0, 4):
|
||||
fp.write(struct.pack('c', chr(0)))
|
||||
for c in imgName:
|
||||
fp.write(struct.pack('c', c))
|
||||
fp.write(struct.pack('c', chr(0)))
|
||||
if len(imgName) < 78:
|
||||
charIndex = len(imgName)
|
||||
for charIndex in range(len(imgName), 79):
|
||||
fp.write(struct.pack('c', chr(0)))
|
||||
|
||||
fp.write(struct.pack('4s', b'')) # dummy
|
||||
fp.write(struct.pack('79s', imgName)) # truncates to 79 chars
|
||||
fp.write(struct.pack('s', b'')) # force null byte after imgname
|
||||
fp.write(struct.pack('>l', colormap))
|
||||
for i in range(0, 404):
|
||||
fp.write(struct.pack('c', chr(0)))
|
||||
for zChannel in range(0, z):
|
||||
dIndex = 0
|
||||
for yPos in range(0, y):
|
||||
for xPos in range(0, x):
|
||||
fp.write(struct.pack('c', chr(channels[zChannel][dIndex])))
|
||||
dIndex += 1
|
||||
|
||||
fp.write(struct.pack('404s', b'')) # dummy
|
||||
|
||||
#assert we've got the right number of bands.
|
||||
if len(im.getbands()) != z:
|
||||
raise ValueError("incorrect number of bands in SGI write: %s vs %s" %
|
||||
(z, len(im.getbands())))
|
||||
|
||||
for channel in im.split():
|
||||
fp.write(channel.tobytes())
|
||||
|
||||
fp.close()
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user