python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-12-25 01:16:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3187 from radarhere/encoderinfo

Browse Source 
Wait until mode is normalized to copy im.info into encoderinfo
This commit is contained in:
Hugo 2018-12-26 12:56:50 +02:00 committed by GitHub
commit bbb3be9a9d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Tests/test_file_gif.py
View File

@ -536,6 +536,27 @@ class TestFileGif(PillowTestCase):
self.assertEqual(reloaded.info['transparency'], 253) self.assertEqual(reloaded.info['transparency'], 253)
def test_rgb_transparency(self):
out = self.tempfile('temp.gif')
# Single frame
im = Image.new('RGB', (1, 1))
im.info['transparency'] = (255, 0, 0)
self.assert_warning(UserWarning, im.save, out)
reloaded = Image.open(out)
self.assertNotIn('transparency', reloaded.info)
# Multiple frames
im = Image.new('RGB', (1, 1))
im.info['transparency'] = b""
ims = [Image.new('RGB', (1, 1))]
self.assert_warning(UserWarning,
im.save, out, save_all=True, append_images=ims)
reloaded = Image.open(out)
self.assertNotIn('transparency', reloaded.info)
def test_bbox(self): def test_bbox(self):
out = self.tempfile('temp.gif') out = self.tempfile('temp.gif')

17
src/PIL/GifImagePlugin.py
View File

@ -393,6 +393,8 @@ def _normalize_palette(im, palette, info):
def _write_single_frame(im, fp, palette): def _write_single_frame(im, fp, palette):
im_out = _normalize_mode(im, True) im_out = _normalize_mode(im, True)
for k, v in im_out.info.items():
im.encoderinfo.setdefault(k, v)
im_out = _normalize_palette(im_out, palette, im.encoderinfo) im_out = _normalize_palette(im_out, palette, im.encoderinfo)
for s in _get_global_header(im_out, im.encoderinfo): for s in _get_global_header(im_out, im.encoderinfo):
@ -413,8 +415,8 @@ def _write_single_frame(im, fp, palette):
def _write_multiple_frames(im, fp, palette): def _write_multiple_frames(im, fp, palette):
duration = im.encoderinfo.get("duration", None) duration = im.encoderinfo.get("duration", im.info.get("duration"))
disposal = im.encoderinfo.get('disposal', None) disposal = im.encoderinfo.get("disposal", im.info.get("disposal"))
im_frames = [] im_frames = []
frame_count = 0 frame_count = 0
@ -423,6 +425,9 @@ def _write_multiple_frames(im, fp, palette):
for im_frame in ImageSequence.Iterator(imSequence): for im_frame in ImageSequence.Iterator(imSequence):
# a copy is required here since seek can still mutate the image # a copy is required here since seek can still mutate the image
im_frame = _normalize_mode(im_frame.copy()) im_frame = _normalize_mode(im_frame.copy())
if frame_count == 0:
for k, v in im_frame.info.items():
im.encoderinfo.setdefault(k, v)
im_frame = _normalize_palette(im_frame, palette, im.encoderinfo) im_frame = _normalize_palette(im_frame, palette, im.encoderinfo)
encoderinfo = im.encoderinfo.copy() encoderinfo = im.encoderinfo.copy()
@ -481,12 +486,10 @@ def _save_all(im, fp, filename):
def _save(im, fp, filename, save_all=False): def _save(im, fp, filename, save_all=False):
for k, v in im.info.items():
im.encoderinfo.setdefault(k, v)
# header # header
try: if "palette" in im.encoderinfo or "palette" in im.info:
palette = im.encoderinfo["palette"] palette = im.encoderinfo.get("palette", im.info.get("palette"))
except KeyError: else:
palette = None palette = None
im.encoderinfo["optimize"] = im.encoderinfo.get("optimize", True) im.encoderinfo["optimize"] = im.encoderinfo.get("optimize", True)