python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-11-04 01:47:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash on save when icc_profile is None

Browse Source
This commit is contained in:
Bruno Renié 2014-01-19 16:40:39 +01:00
parent bb449f30ec
commit 0348fcac51
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PIL/PngImagePlugin.py
View File

@ -618,7 +618,7 @@ def _save(im, fp, filename, chunk=putchunk, check=0):
name = p.tags.desc.get("ASCII", p.tags.desc.get("Unicode", p.tags.desc.get("Macintosh", p.tags.desc.get("en", {}).get("US", "ICC Profile")))).encode("latin1", "replace")[:79] name = p.tags.desc.get("ASCII", p.tags.desc.get("Unicode", p.tags.desc.get("Macintosh", p.tags.desc.get("en", {}).get("US", "ICC Profile")))).encode("latin1", "replace")[:79]
except ImportError: except ImportError:
name = b"ICC Profile" name = b"ICC Profile"
data = name + b"\0\0" + zlib.compress(im.info["icc_profile"]) data = name or b'ICC Profile' + b"\0\0" + zlib.compress(im.info["icc_profile"])
chunk(fp, b"iCCP", data) chunk(fp, b"iCCP", data)
ImageFile._save(im, _idat(fp, chunk), [("zip", (0,0)+im.size, 0, rawmode)]) ImageFile._save(im, _idat(fp, chunk), [("zip", (0,0)+im.size, 0, rawmode)])

BIN
Tests/images/icc_profile_none.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.0 KiB

7
Tests/test_file_png.py
View File

@ -250,3 +250,10 @@ def test_trns_rgb():
im = roundtrip(im, transparency=(0, 1, 2)) im = roundtrip(im, transparency=(0, 1, 2))
assert_equal(im.info["transparency"], (0, 1, 2)) assert_equal(im.info["transparency"], (0, 1, 2))
def test_save_icc_profile_none():
in_file = "Tests/images/icc_profile_none.png"
im = Image.open(in_file)
file = tempfile("temp.png")
assert_no_exception(lambda: im.save(file))