mirror of
https://github.com/python-pillow/Pillow.git
synced 2025-08-09 14:54:46 +03:00
Merge 5f8e559521 into 8e6ef35f78
This commit is contained in:
Hugo
commit
35c8953597
|
|
@ -12,74 +12,75 @@ __version__ = "1.0"
|
||||||
from PIL import Image, ImageFile, _binary
|
from PIL import Image, ImageFile, _binary
|
||||||
|
|
||||||
_Palm8BitColormapValues = (
|
_Palm8BitColormapValues = (
|
||||||
( 255, 255, 255 ), ( 255, 204, 255 ), ( 255, 153, 255 ), ( 255, 102, 255 ),
|
(255, 255, 255), (255, 204, 255), (255, 153, 255), (255, 102, 255),
|
||||||
( 255, 51, 255 ), ( 255, 0, 255 ), ( 255, 255, 204 ), ( 255, 204, 204 ),
|
(255, 51, 255), (255, 0, 255), (255, 255, 204), (255, 204, 204),
|
||||||
( 255, 153, 204 ), ( 255, 102, 204 ), ( 255, 51, 204 ), ( 255, 0, 204 ),
|
(255, 153, 204), (255, 102, 204), (255, 51, 204), (255, 0, 204),
|
||||||
( 255, 255, 153 ), ( 255, 204, 153 ), ( 255, 153, 153 ), ( 255, 102, 153 ),
|
(255, 255, 153), (255, 204, 153), (255, 153, 153), (255, 102, 153),
|
||||||
( 255, 51, 153 ), ( 255, 0, 153 ), ( 204, 255, 255 ), ( 204, 204, 255 ),
|
(255, 51, 153), (255, 0, 153), (204, 255, 255), (204, 204, 255),
|
||||||
( 204, 153, 255 ), ( 204, 102, 255 ), ( 204, 51, 255 ), ( 204, 0, 255 ),
|
(204, 153, 255), (204, 102, 255), (204, 51, 255), (204, 0, 255),
|
||||||
( 204, 255, 204 ), ( 204, 204, 204 ), ( 204, 153, 204 ), ( 204, 102, 204 ),
|
(204, 255, 204), (204, 204, 204), (204, 153, 204), (204, 102, 204),
|
||||||
( 204, 51, 204 ), ( 204, 0, 204 ), ( 204, 255, 153 ), ( 204, 204, 153 ),
|
(204, 51, 204), (204, 0, 204), (204, 255, 153), (204, 204, 153),
|
||||||
( 204, 153, 153 ), ( 204, 102, 153 ), ( 204, 51, 153 ), ( 204, 0, 153 ),
|
(204, 153, 153), (204, 102, 153), (204, 51, 153), (204, 0, 153),
|
||||||
( 153, 255, 255 ), ( 153, 204, 255 ), ( 153, 153, 255 ), ( 153, 102, 255 ),
|
(153, 255, 255), (153, 204, 255), (153, 153, 255), (153, 102, 255),
|
||||||
( 153, 51, 255 ), ( 153, 0, 255 ), ( 153, 255, 204 ), ( 153, 204, 204 ),
|
(153, 51, 255), (153, 0, 255), (153, 255, 204), (153, 204, 204),
|
||||||
( 153, 153, 204 ), ( 153, 102, 204 ), ( 153, 51, 204 ), ( 153, 0, 204 ),
|
(153, 153, 204), (153, 102, 204), (153, 51, 204), (153, 0, 204),
|
||||||
( 153, 255, 153 ), ( 153, 204, 153 ), ( 153, 153, 153 ), ( 153, 102, 153 ),
|
(153, 255, 153), (153, 204, 153), (153, 153, 153), (153, 102, 153),
|
||||||
( 153, 51, 153 ), ( 153, 0, 153 ), ( 102, 255, 255 ), ( 102, 204, 255 ),
|
(153, 51, 153), (153, 0, 153), (102, 255, 255), (102, 204, 255),
|
||||||
( 102, 153, 255 ), ( 102, 102, 255 ), ( 102, 51, 255 ), ( 102, 0, 255 ),
|
(102, 153, 255), (102, 102, 255), (102, 51, 255), (102, 0, 255),
|
||||||
( 102, 255, 204 ), ( 102, 204, 204 ), ( 102, 153, 204 ), ( 102, 102, 204 ),
|
(102, 255, 204), (102, 204, 204), (102, 153, 204), (102, 102, 204),
|
||||||
( 102, 51, 204 ), ( 102, 0, 204 ), ( 102, 255, 153 ), ( 102, 204, 153 ),
|
(102, 51, 204), (102, 0, 204), (102, 255, 153), (102, 204, 153),
|
||||||
( 102, 153, 153 ), ( 102, 102, 153 ), ( 102, 51, 153 ), ( 102, 0, 153 ),
|
(102, 153, 153), (102, 102, 153), (102, 51, 153), (102, 0, 153),
|
||||||
( 51, 255, 255 ), ( 51, 204, 255 ), ( 51, 153, 255 ), ( 51, 102, 255 ),
|
( 51, 255, 255), ( 51, 204, 255), ( 51, 153, 255), ( 51, 102, 255),
|
||||||
( 51, 51, 255 ), ( 51, 0, 255 ), ( 51, 255, 204 ), ( 51, 204, 204 ),
|
( 51, 51, 255), ( 51, 0, 255), ( 51, 255, 204), ( 51, 204, 204),
|
||||||
( 51, 153, 204 ), ( 51, 102, 204 ), ( 51, 51, 204 ), ( 51, 0, 204 ),
|
( 51, 153, 204), ( 51, 102, 204), ( 51, 51, 204), ( 51, 0, 204),
|
||||||
( 51, 255, 153 ), ( 51, 204, 153 ), ( 51, 153, 153 ), ( 51, 102, 153 ),
|
( 51, 255, 153), ( 51, 204, 153), ( 51, 153, 153), ( 51, 102, 153),
|
||||||
( 51, 51, 153 ), ( 51, 0, 153 ), ( 0, 255, 255 ), ( 0, 204, 255 ),
|
( 51, 51, 153), ( 51, 0, 153), ( 0, 255, 255), ( 0, 204, 255),
|
||||||
( 0, 153, 255 ), ( 0, 102, 255 ), ( 0, 51, 255 ), ( 0, 0, 255 ),
|
( 0, 153, 255), ( 0, 102, 255), ( 0, 51, 255), ( 0, 0, 255),
|
||||||
( 0, 255, 204 ), ( 0, 204, 204 ), ( 0, 153, 204 ), ( 0, 102, 204 ),
|
( 0, 255, 204), ( 0, 204, 204), ( 0, 153, 204), ( 0, 102, 204),
|
||||||
( 0, 51, 204 ), ( 0, 0, 204 ), ( 0, 255, 153 ), ( 0, 204, 153 ),
|
( 0, 51, 204), ( 0, 0, 204), ( 0, 255, 153), ( 0, 204, 153),
|
||||||
( 0, 153, 153 ), ( 0, 102, 153 ), ( 0, 51, 153 ), ( 0, 0, 153 ),
|
( 0, 153, 153), ( 0, 102, 153), ( 0, 51, 153), ( 0, 0, 153),
|
||||||
( 255, 255, 102 ), ( 255, 204, 102 ), ( 255, 153, 102 ), ( 255, 102, 102 ),
|
(255, 255, 102), (255, 204, 102), (255, 153, 102), (255, 102, 102),
|
||||||
( 255, 51, 102 ), ( 255, 0, 102 ), ( 255, 255, 51 ), ( 255, 204, 51 ),
|
(255, 51, 102), (255, 0, 102), (255, 255, 51), (255, 204, 51),
|
||||||
( 255, 153, 51 ), ( 255, 102, 51 ), ( 255, 51, 51 ), ( 255, 0, 51 ),
|
(255, 153, 51), (255, 102, 51), (255, 51, 51), (255, 0, 51),
|
||||||
( 255, 255, 0 ), ( 255, 204, 0 ), ( 255, 153, 0 ), ( 255, 102, 0 ),
|
(255, 255, 0), (255, 204, 0), (255, 153, 0), (255, 102, 0),
|
||||||
( 255, 51, 0 ), ( 255, 0, 0 ), ( 204, 255, 102 ), ( 204, 204, 102 ),
|
(255, 51, 0), (255, 0, 0), (204, 255, 102), (204, 204, 102),
|
||||||
( 204, 153, 102 ), ( 204, 102, 102 ), ( 204, 51, 102 ), ( 204, 0, 102 ),
|
(204, 153, 102), (204, 102, 102), (204, 51, 102), (204, 0, 102),
|
||||||
( 204, 255, 51 ), ( 204, 204, 51 ), ( 204, 153, 51 ), ( 204, 102, 51 ),
|
(204, 255, 51), (204, 204, 51), (204, 153, 51), (204, 102, 51),
|
||||||
( 204, 51, 51 ), ( 204, 0, 51 ), ( 204, 255, 0 ), ( 204, 204, 0 ),
|
(204, 51, 51), (204, 0, 51), (204, 255, 0), (204, 204, 0),
|
||||||
( 204, 153, 0 ), ( 204, 102, 0 ), ( 204, 51, 0 ), ( 204, 0, 0 ),
|
(204, 153, 0), (204, 102, 0), (204, 51, 0), (204, 0, 0),
|
||||||
( 153, 255, 102 ), ( 153, 204, 102 ), ( 153, 153, 102 ), ( 153, 102, 102 ),
|
(153, 255, 102), (153, 204, 102), (153, 153, 102), (153, 102, 102),
|
||||||
( 153, 51, 102 ), ( 153, 0, 102 ), ( 153, 255, 51 ), ( 153, 204, 51 ),
|
(153, 51, 102), (153, 0, 102), (153, 255, 51), (153, 204, 51),
|
||||||
( 153, 153, 51 ), ( 153, 102, 51 ), ( 153, 51, 51 ), ( 153, 0, 51 ),
|
(153, 153, 51), (153, 102, 51), (153, 51, 51), (153, 0, 51),
|
||||||
( 153, 255, 0 ), ( 153, 204, 0 ), ( 153, 153, 0 ), ( 153, 102, 0 ),
|
(153, 255, 0), (153, 204, 0), (153, 153, 0), (153, 102, 0),
|
||||||
( 153, 51, 0 ), ( 153, 0, 0 ), ( 102, 255, 102 ), ( 102, 204, 102 ),
|
(153, 51, 0), (153, 0, 0), (102, 255, 102), (102, 204, 102),
|
||||||
( 102, 153, 102 ), ( 102, 102, 102 ), ( 102, 51, 102 ), ( 102, 0, 102 ),
|
(102, 153, 102), (102, 102, 102), (102, 51, 102), (102, 0, 102),
|
||||||
( 102, 255, 51 ), ( 102, 204, 51 ), ( 102, 153, 51 ), ( 102, 102, 51 ),
|
(102, 255, 51), (102, 204, 51), (102, 153, 51), (102, 102, 51),
|
||||||
( 102, 51, 51 ), ( 102, 0, 51 ), ( 102, 255, 0 ), ( 102, 204, 0 ),
|
(102, 51, 51), (102, 0, 51), (102, 255, 0), (102, 204, 0),
|
||||||
( 102, 153, 0 ), ( 102, 102, 0 ), ( 102, 51, 0 ), ( 102, 0, 0 ),
|
(102, 153, 0), (102, 102, 0), (102, 51, 0), (102, 0, 0),
|
||||||
( 51, 255, 102 ), ( 51, 204, 102 ), ( 51, 153, 102 ), ( 51, 102, 102 ),
|
( 51, 255, 102), ( 51, 204, 102), ( 51, 153, 102), ( 51, 102, 102),
|
||||||
( 51, 51, 102 ), ( 51, 0, 102 ), ( 51, 255, 51 ), ( 51, 204, 51 ),
|
( 51, 51, 102), ( 51, 0, 102), ( 51, 255, 51), ( 51, 204, 51),
|
||||||
( 51, 153, 51 ), ( 51, 102, 51 ), ( 51, 51, 51 ), ( 51, 0, 51 ),
|
( 51, 153, 51), ( 51, 102, 51), ( 51, 51, 51), ( 51, 0, 51),
|
||||||
( 51, 255, 0 ), ( 51, 204, 0 ), ( 51, 153, 0 ), ( 51, 102, 0 ),
|
( 51, 255, 0), ( 51, 204, 0), ( 51, 153, 0), ( 51, 102, 0),
|
||||||
( 51, 51, 0 ), ( 51, 0, 0 ), ( 0, 255, 102 ), ( 0, 204, 102 ),
|
( 51, 51, 0), ( 51, 0, 0), ( 0, 255, 102), ( 0, 204, 102),
|
||||||
( 0, 153, 102 ), ( 0, 102, 102 ), ( 0, 51, 102 ), ( 0, 0, 102 ),
|
( 0, 153, 102), ( 0, 102, 102), ( 0, 51, 102), ( 0, 0, 102),
|
||||||
( 0, 255, 51 ), ( 0, 204, 51 ), ( 0, 153, 51 ), ( 0, 102, 51 ),
|
( 0, 255, 51), ( 0, 204, 51), ( 0, 153, 51), ( 0, 102, 51),
|
||||||
( 0, 51, 51 ), ( 0, 0, 51 ), ( 0, 255, 0 ), ( 0, 204, 0 ),
|
( 0, 51, 51), ( 0, 0, 51), ( 0, 255, 0), ( 0, 204, 0),
|
||||||
( 0, 153, 0 ), ( 0, 102, 0 ), ( 0, 51, 0 ), ( 17, 17, 17 ),
|
( 0, 153, 0), ( 0, 102, 0), ( 0, 51, 0), ( 17, 17, 17),
|
||||||
( 34, 34, 34 ), ( 68, 68, 68 ), ( 85, 85, 85 ), ( 119, 119, 119 ),
|
( 34, 34, 34), ( 68, 68, 68), ( 85, 85, 85), (119, 119, 119),
|
||||||
( 136, 136, 136 ), ( 170, 170, 170 ), ( 187, 187, 187 ), ( 221, 221, 221 ),
|
(136, 136, 136), (170, 170, 170), (187, 187, 187), (221, 221, 221),
|
||||||
( 238, 238, 238 ), ( 192, 192, 192 ), ( 128, 0, 0 ), ( 128, 0, 128 ),
|
(238, 238, 238), (192, 192, 192), (128, 0, 0), (128, 0, 128),
|
||||||
( 0, 128, 0 ), ( 0, 128, 128 ), ( 0, 0, 0 ), ( 0, 0, 0 ),
|
( 0, 128, 0), ( 0, 128, 128), ( 0, 0, 0), ( 0, 0, 0),
|
||||||
( 0, 0, 0 ), ( 0, 0, 0 ), ( 0, 0, 0 ), ( 0, 0, 0 ),
|
( 0, 0, 0), ( 0, 0, 0), ( 0, 0, 0), ( 0, 0, 0),
|
||||||
( 0, 0, 0 ), ( 0, 0, 0 ), ( 0, 0, 0 ), ( 0, 0, 0 ),
|
( 0, 0, 0), ( 0, 0, 0), ( 0, 0, 0), ( 0, 0, 0),
|
||||||
( 0, 0, 0 ), ( 0, 0, 0 ), ( 0, 0, 0 ), ( 0, 0, 0 ),
|
( 0, 0, 0), ( 0, 0, 0), ( 0, 0, 0), ( 0, 0, 0),
|
||||||
( 0, 0, 0 ), ( 0, 0, 0 ), ( 0, 0, 0 ), ( 0, 0, 0 ),
|
( 0, 0, 0), ( 0, 0, 0), ( 0, 0, 0), ( 0, 0, 0),
|
||||||
( 0, 0, 0 ), ( 0, 0, 0 ), ( 0, 0, 0 ), ( 0, 0, 0 ),
|
( 0, 0, 0), ( 0, 0, 0), ( 0, 0, 0), ( 0, 0, 0),
|
||||||
( 0, 0, 0 ), ( 0, 0, 0 ), ( 0, 0, 0 ), ( 0, 0, 0 ))
|
( 0, 0, 0), ( 0, 0, 0), ( 0, 0, 0), ( 0, 0, 0))
|
||||||
|
|
||||||
|
|
||||||
# so build a prototype image to be used for palette resampling
|
# so build a prototype image to be used for palette resampling
|
||||||
def build_prototype_image():
|
def build_prototype_image():
|
||||||
image = Image.new("L", (1,len(_Palm8BitColormapValues),))
|
image = Image.new("L", (1, len(_Palm8BitColormapValues),))
|
||||||
image.putdata(list(range(len(_Palm8BitColormapValues))))
|
image.putdata(list(range(len(_Palm8BitColormapValues))))
|
||||||
palettedata = ()
|
palettedata = ()
|
||||||
for i in range(len(_Palm8BitColormapValues)):
|
for i in range(len(_Palm8BitColormapValues)):
|
||||||
|
|
@ -91,7 +92,8 @@ def build_prototype_image():
|
||||||
|
|
||||||
Palm8BitColormapImage = build_prototype_image()
|
Palm8BitColormapImage = build_prototype_image()
|
||||||
|
|
||||||
# OK, we now have in Palm8BitColormapImage, a "P"-mode image with the right palette
|
# OK, we now have in Palm8BitColormapImage,
|
||||||
|
# a "P"-mode image with the right palette
|
||||||
#
|
#
|
||||||
# --------------------------------------------------------------------
|
# --------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
@ -110,6 +112,7 @@ _COMPRESSION_TYPES = {
|
||||||
o8 = _binary.o8
|
o8 = _binary.o8
|
||||||
o16b = _binary.o16be
|
o16b = _binary.o16be
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# --------------------------------------------------------------------
|
# --------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
@ -127,12 +130,16 @@ def _save(im, fp, filename, check=0):
|
||||||
bpp = 8
|
bpp = 8
|
||||||
version = 1
|
version = 1
|
||||||
|
|
||||||
elif im.mode == "L" and "bpp" in im.encoderinfo and im.encoderinfo["bpp"] in (1, 2, 4):
|
elif (im.mode == "L" and
|
||||||
|
"bpp" in im.encoderinfo and
|
||||||
|
im.encoderinfo["bpp"] in (1, 2, 4)):
|
||||||
|
|
||||||
# this is 8-bit grayscale, so we shift it to get the high-order bits, and invert it because
|
# this is 8-bit grayscale, so we shift it to get the high-order bits,
|
||||||
|
# and invert it because
|
||||||
# Palm does greyscale from white (0) to black (1)
|
# Palm does greyscale from white (0) to black (1)
|
||||||
bpp = im.encoderinfo["bpp"]
|
bpp = im.encoderinfo["bpp"]
|
||||||
im = im.point(lambda x, shift=8-bpp, maxval=(1 << bpp)-1: maxval - (x >> shift))
|
im = im.point(
|
||||||
|
lambda x, shift=8-bpp, maxval=(1 << bpp)-1: maxval - (x >> shift))
|
||||||
# we ignore the palette here
|
# we ignore the palette here
|
||||||
im.mode = "P"
|
im.mode = "P"
|
||||||
rawmode = "P;" + str(bpp)
|
rawmode = "P;" + str(bpp)
|
||||||
|
|
@ -140,8 +147,9 @@ def _save(im, fp, filename, check=0):
|
||||||
|
|
||||||
elif im.mode == "L" and "bpp" in im.info and im.info["bpp"] in (1, 2, 4):
|
elif im.mode == "L" and "bpp" in im.info and im.info["bpp"] in (1, 2, 4):
|
||||||
|
|
||||||
# here we assume that even though the inherent mode is 8-bit grayscale, only
|
# here we assume that even though the inherent mode is 8-bit grayscale,
|
||||||
# the lower bpp bits are significant. We invert them to match the Palm.
|
# only the lower bpp bits are significant.
|
||||||
|
# We invert them to match the Palm.
|
||||||
bpp = im.info["bpp"]
|
bpp = im.info["bpp"]
|
||||||
im = im.point(lambda x, maxval=(1 << bpp)-1: maxval - (x & maxval))
|
im = im.point(lambda x, maxval=(1 << bpp)-1: maxval - (x & maxval))
|
||||||
# we ignore the palette here
|
# we ignore the palette here
|
||||||
|
|
@ -172,7 +180,7 @@ def _save(im, fp, filename, check=0):
|
||||||
cols = im.size[0]
|
cols = im.size[0]
|
||||||
rows = im.size[1]
|
rows = im.size[1]
|
||||||
|
|
||||||
rowbytes = ((cols + (16//bpp - 1)) / (16 // bpp)) * 2
|
rowbytes = int((cols + (16//bpp - 1)) / (16 // bpp)) * 2
|
||||||
transparent_index = 0
|
transparent_index = 0
|
||||||
compression_type = _COMPRESSION_TYPES["none"]
|
compression_type = _COMPRESSION_TYPES["none"]
|
||||||
|
|
||||||
|
|
@ -205,12 +213,19 @@ def _save(im, fp, filename, check=0):
|
||||||
for i in range(256):
|
for i in range(256):
|
||||||
fp.write(o8(i))
|
fp.write(o8(i))
|
||||||
if colormapmode == 'RGB':
|
if colormapmode == 'RGB':
|
||||||
fp.write(o8(colormap[3 * i]) + o8(colormap[3 * i + 1]) + o8(colormap[3 * i + 2]))
|
fp.write(
|
||||||
|
o8(colormap[3 * i]) +
|
||||||
|
o8(colormap[3 * i + 1]) +
|
||||||
|
o8(colormap[3 * i + 2]))
|
||||||
elif colormapmode == 'RGBA':
|
elif colormapmode == 'RGBA':
|
||||||
fp.write(o8(colormap[4 * i]) + o8(colormap[4 * i + 1]) + o8(colormap[4 * i + 2]))
|
fp.write(
|
||||||
|
o8(colormap[4 * i]) +
|
||||||
|
o8(colormap[4 * i + 1]) +
|
||||||
|
o8(colormap[4 * i + 2]))
|
||||||
|
|
||||||
# now convert data to raw form
|
# now convert data to raw form
|
||||||
ImageFile._save(im, fp, [("raw", (0,0)+im.size, 0, (rawmode, rowbytes, 1))])
|
ImageFile._save(
|
||||||
|
im, fp, [("raw", (0, 0)+im.size, 0, (rawmode, rowbytes, 1))])
|
||||||
|
|
||||||
fp.flush()
|
fp.flush()
|
||||||
|
|
||||||
|
|
|
||||||
45
Tests/test_file_palm.py
Normal file
45
Tests/test_file_palm.py
Normal file
|
|
@ -0,0 +1,45 @@
|
||||||
|
from helper import unittest, PillowTestCase, tearDownModule, lena
|
||||||
|
|
||||||
|
import os.path
|
||||||
|
|
||||||
|
|
||||||
|
class TestFilePalm(PillowTestCase):
|
||||||
|
|
||||||
|
def helper_save_as_palm(self, mode):
|
||||||
|
# Arrange
|
||||||
|
im = lena(mode)
|
||||||
|
outfile = self.tempfile("temp_" + mode + ".palm")
|
||||||
|
|
||||||
|
# Act
|
||||||
|
im.save(outfile)
|
||||||
|
|
||||||
|
# Assert
|
||||||
|
self.assertTrue(os.path.isfile(outfile))
|
||||||
|
self.assertGreater(os.path.getsize(outfile), 0)
|
||||||
|
|
||||||
|
def test_monochrome(self):
|
||||||
|
# Arrange
|
||||||
|
mode = "1"
|
||||||
|
|
||||||
|
# Act / Assert
|
||||||
|
self.helper_save_as_palm(mode)
|
||||||
|
|
||||||
|
def test_p_mode(self):
|
||||||
|
# Arrange
|
||||||
|
mode = "P"
|
||||||
|
|
||||||
|
# Act / Assert
|
||||||
|
self.helper_save_as_palm(mode)
|
||||||
|
|
||||||
|
def test_rgb_ioerror(self):
|
||||||
|
# Arrange
|
||||||
|
mode = "RGB"
|
||||||
|
|
||||||
|
# Act / Assert
|
||||||
|
self.assertRaises(IOError, lambda: self.helper_save_as_palm(mode))
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
unittest.main()
|
||||||
|
|
||||||
|
# End of file
|
||||||
Loading…
Reference in New Issue
Block a user