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

Do not save incorrect info key

Browse Source
This commit is contained in:
Andrew Murray 2016-05-11 22:13:59 +10:00
parent 547794157c
commit f329fabaff
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
PIL/JpegImagePlugin.py
View File

@ -158,7 +158,7 @@ def SOF(self, marker):
raise SyntaxError("cannot handle %d-layer images" % self.layers) raise SyntaxError("cannot handle %d-layer images" % self.layers)
if marker in [0xFFC2, 0xFFC6, 0xFFCA, 0xFFCE]: if marker in [0xFFC2, 0xFFC6, 0xFFCA, 0xFFCE]:
self.info["progressive"] = self.info["progression"] = 1 self.info["progressive"] = 1
if self.icclist: if self.icclist:
# fixup icc profile # fixup icc profile
@ -673,12 +673,14 @@ def _save(im, fp, filename):
i += 1 i += 1
# get keyword arguments # get keyword arguments
im.encoderconfig = ( if "progression" in info and not "progressive" in info:
quality,
# "progressive" is the official name, but older documentation # "progressive" is the official name, but older documentation
# says "progression" # says "progression"
# FIXME: issue a warning if the wrong form is used (post-1.1.7) # FIXME: issue a warning if the wrong form is used (post-1.1.7)
"progressive" in info or "progression" in info, info["progressive"] = info.pop("progression")
im.encoderconfig = (
quality,
"progressive" in info,
info.get("smooth", 0), info.get("smooth", 0),
"optimize" in info, "optimize" in info,
info.get("streamtype", 0), info.get("streamtype", 0),
@ -694,7 +696,7 @@ def _save(im, fp, filename):
# channels*size, this is a value that's been used in a django patch. # channels*size, this is a value that's been used in a django patch.
# https://github.com/matthewwithanm/django-imagekit/issues/50 # https://github.com/matthewwithanm/django-imagekit/issues/50
bufsize = 0 bufsize = 0
if "optimize" in info or "progressive" in info or "progression" in info: if "optimize" in info or "progressive" in info:
# keep sets quality to 0, but the actual value may be high. # keep sets quality to 0, but the actual value may be high.
if quality >= 95 or quality == 0: if quality >= 95 or quality == 0:
bufsize = 2 * im.size[0] * im.size[1] bufsize = 2 * im.size[0] * im.size[1]

3
Tests/test_file_jpeg.py
View File

@ -232,11 +232,8 @@ class TestFileJpeg(PillowTestCase):
self.assert_image_equal(im1, im2) self.assert_image_equal(im1, im2)
self.assert_image_equal(im1, im3) self.assert_image_equal(im1, im3)
self.assertFalse(im1.info.get("progressive")) self.assertFalse(im1.info.get("progressive"))
self.assertFalse(im1.info.get("progression"))
self.assertTrue(im2.info.get("progressive")) self.assertTrue(im2.info.get("progressive"))
self.assertTrue(im2.info.get("progression"))
self.assertTrue(im3.info.get("progressive")) self.assertTrue(im3.info.get("progressive"))
self.assertTrue(im3.info.get("progression"))
def test_quality(self): def test_quality(self):
im1 = self.roundtrip(hopper()) im1 = self.roundtrip(hopper())