mirror of
https://github.com/python-pillow/Pillow.git
synced 2025-01-12 10:16:17 +03:00
Merge pull request #2010 from uploadcare/jpeg-raise-on-alpha
Show warning when trying to save RGBA image as JPEG
This commit is contained in:
commit
e980ca7896
|
@ -583,6 +583,14 @@ def _save(im, fp, filename):
|
||||||
except KeyError:
|
except KeyError:
|
||||||
raise IOError("cannot write mode %s as JPEG" % im.mode)
|
raise IOError("cannot write mode %s as JPEG" % im.mode)
|
||||||
|
|
||||||
|
if im.mode == 'RGBA':
|
||||||
|
warnings.warn(
|
||||||
|
'You are saving RGBA image as JPEG. The alpha channel will be '
|
||||||
|
'discarded. This conversion is deprecated and will be disabled '
|
||||||
|
'in Pillow 3.7. Please, convert the image to RGB explicitly.',
|
||||||
|
DeprecationWarning
|
||||||
|
)
|
||||||
|
|
||||||
info = im.encoderinfo
|
info = im.encoderinfo
|
||||||
|
|
||||||
dpi = info.get("dpi", (0, 0))
|
dpi = info.get("dpi", (0, 0))
|
||||||
|
|
|
@ -99,7 +99,7 @@ class PillowTestCase(unittest.TestCase):
|
||||||
" average pixel value difference %.4f > epsilon %.4f" % (
|
" average pixel value difference %.4f > epsilon %.4f" % (
|
||||||
ave_diff, epsilon))
|
ave_diff, epsilon))
|
||||||
|
|
||||||
def assert_warning(self, warn_class, func):
|
def assert_warning(self, warn_class, func, *args, **kwargs):
|
||||||
import warnings
|
import warnings
|
||||||
|
|
||||||
result = None
|
result = None
|
||||||
|
@ -108,7 +108,7 @@ class PillowTestCase(unittest.TestCase):
|
||||||
warnings.simplefilter("always")
|
warnings.simplefilter("always")
|
||||||
|
|
||||||
# Hopefully trigger a warning.
|
# Hopefully trigger a warning.
|
||||||
result = func()
|
result = func(*args, **kwargs)
|
||||||
|
|
||||||
# Verify some things.
|
# Verify some things.
|
||||||
self.assertGreaterEqual(len(w), 1)
|
self.assertGreaterEqual(len(w), 1)
|
||||||
|
|
|
@ -450,6 +450,25 @@ class TestFileJpeg(PillowTestCase):
|
||||||
# Assert
|
# Assert
|
||||||
self.assertEqual(im.format, "JPEG")
|
self.assertEqual(im.format, "JPEG")
|
||||||
|
|
||||||
|
def test_save_correct_modes(self):
|
||||||
|
out = BytesIO()
|
||||||
|
for mode in ['1', 'L', 'RGB', 'RGBX', 'CMYK', 'YCbCr']:
|
||||||
|
img = Image.new(mode, (20, 20))
|
||||||
|
img.save(out, "JPEG")
|
||||||
|
|
||||||
|
def test_save_wrong_modes(self):
|
||||||
|
out = BytesIO()
|
||||||
|
for mode in ['LA', 'La', 'RGBa', 'P']:
|
||||||
|
img = Image.new(mode, (20, 20))
|
||||||
|
self.assertRaises(IOError, img.save, out, "JPEG")
|
||||||
|
|
||||||
|
def test_save_modes_with_warnings(self):
|
||||||
|
# ref https://github.com/python-pillow/Pillow/issues/2005
|
||||||
|
out = BytesIO()
|
||||||
|
for mode in ['RGBA']:
|
||||||
|
img = Image.new(mode, (20, 20))
|
||||||
|
self.assert_warning(DeprecationWarning, img.save, out, "JPEG")
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
unittest.main()
|
unittest.main()
|
||||||
|
|
Loading…
Reference in New Issue
Block a user