From aee5d22a2082350ee36e5cd425d94b20990b9e07 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Sat, 15 Feb 2020 14:17:38 +1100
Subject: [PATCH] Added convert_mode param when saving

---
 Tests/images/pil123rgba_red.jpg | Bin 0 -> 4666 bytes
 Tests/test_file_gif.py          |  11 ++++++++
 Tests/test_file_jpeg.py         |  16 +++++++++--
 Tests/test_file_png.py          |   8 ++++++
 Tests/test_file_webp.py         |   8 ++++++
 Tests/test_image.py             |  17 +++++++++++-
 src/PIL/GifImagePlugin.py       |   7 +++++
 src/PIL/Image.py                |  46 ++++++++++++++++++++++++++++----
 src/PIL/JpegImagePlugin.py      |  11 ++++++++
 src/PIL/PngImagePlugin.py       |   6 +++++
 src/PIL/WebPImagePlugin.py      |  13 +++++++++
 11 files changed, 135 insertions(+), 8 deletions(-)
 create mode 100644 Tests/images/pil123rgba_red.jpg

diff --git a/Tests/images/pil123rgba_red.jpg b/Tests/images/pil123rgba_red.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..073a654366dd60e2420e99ad61ec88e17cf76c49
GIT binary patch
literal 4666
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

literal 0
HcmV?d00001

diff --git a/Tests/test_file_gif.py b/Tests/test_file_gif.py
index 90943ac8f69..fff2da930db 100644
--- a/Tests/test_file_gif.py
+++ b/Tests/test_file_gif.py
@@ -786,6 +786,17 @@ def test_save_I(tmp_path):
         assert_image_equal(reloaded.convert("L"), im.convert("L"))
 
 
+def test_save_wrong_modes(self):
+    out = BytesIO()
+    for mode in ["CMYK"]:
+        img = Image.new(mode, (20, 20))
+        self.assertRaises(ValueError, img.save, out, "GIF")
+
+    for mode in ["CMYK", "LA"]:
+        img = Image.new(mode, (20, 20))
+        img.save(out, "GIF", convert_mode=True)
+
+
 def test_getdata():
     # Test getheader/getdata against legacy values.
     # Create a 'P' image with holes in the palette.
diff --git a/Tests/test_file_jpeg.py b/Tests/test_file_jpeg.py
index 03a2dba51a1..fbf57e8ad45 100644
--- a/Tests/test_file_jpeg.py
+++ b/Tests/test_file_jpeg.py
@@ -558,14 +558,26 @@ def test_save_correct_modes(self):
             img = Image.new(mode, (20, 20))
             img.save(out, "JPEG")
 
-    def test_save_wrong_modes(self):
+    def test_save_wrong_modes(self, tmp_path):
         # ref https://github.com/python-pillow/Pillow/issues/2005
         out = BytesIO()
-        for mode in ["LA", "La", "RGBA", "RGBa", "P"]:
+        for mode in ["LA", "La", "RGBA", "RGBa", "P", "I"]:
             img = Image.new(mode, (20, 20))
             with pytest.raises(OSError):
                 img.save(out, "JPEG")
 
+        for mode in ["LA", "RGBA", "P", "I"]:
+            img = Image.new(mode, (20, 20))
+            img.save(out, "JPEG", convert_mode=True)
+
+        temp_file = str(tmp_path / "temp.jpg")
+        with Image.open("Tests/images/pil123rgba.png") as img:
+            img.save(temp_file, convert_mode=True, fill_color="red")
+
+        with Image.open(temp_file) as reloaded:
+            with Image.open("Tests/images/pil123rgba_red.jpg") as target:
+                assert_image_similar(reloaded, target, 4)
+
     def test_save_tiff_with_dpi(self, tmp_path):
         # Arrange
         outfile = str(tmp_path / "temp.tif")
diff --git a/Tests/test_file_png.py b/Tests/test_file_png.py
index f5993674105..ac342188a38 100644
--- a/Tests/test_file_png.py
+++ b/Tests/test_file_png.py
@@ -230,6 +230,14 @@ def test_load_transparent_rgb(self):
         # image has 876 transparent pixels
         assert im.getchannel("A").getcolors()[0][0] == 876
 
+    def test_save_CMYK(self):
+        out = BytesIO()
+        im = Image.new("CMYK", (20, 20))
+        with pytest.raises(IOError):
+            im.save(out, "PNG")
+
+        im.save(out, "PNG", convert_mode=True)
+
     def test_save_p_transparent_palette(self, tmp_path):
         in_file = "Tests/images/pil123p.png"
         with Image.open(in_file) as im:
diff --git a/Tests/test_file_webp.py b/Tests/test_file_webp.py
index 11fbd9fd579..19c50b4647a 100644
--- a/Tests/test_file_webp.py
+++ b/Tests/test_file_webp.py
@@ -12,6 +12,8 @@
     skip_unless_feature,
 )
 
+from io import BytesIO
+
 try:
     from PIL import _webp
 
@@ -85,6 +87,12 @@ def _roundtrip(self, tmp_path, mode, epsilon, args={}):
                 target = target.convert(self.rgb_mode)
             assert_image_similar(image, target, epsilon)
 
+    def test_save_convert_mode(self):
+        out = BytesIO()
+        for mode in ["CMYK", "I", "L", "LA", "P"]:
+            img = Image.new(mode, (20, 20))
+            img.save(out, "WEBP", convert_mode=True)
+
     def test_write_rgb(self, tmp_path):
         """
         Can we write a RGB mode file to webp without error?
diff --git a/Tests/test_image.py b/Tests/test_image.py
index cc0edbdd7a7..5e2d50e8f5f 100644
--- a/Tests/test_image.py
+++ b/Tests/test_image.py
@@ -6,7 +6,14 @@
 import pytest
 
 import PIL
-from PIL import Image, ImageDraw, ImagePalette, ImageShow, UnidentifiedImageError
+from PIL import (
+    Image,
+    ImageDraw,
+    ImagePalette,
+    ImageShow,
+    TiffImagePlugin,
+    UnidentifiedImageError,
+)
 
 from .helper import (
     assert_image_equal,
@@ -377,6 +384,14 @@ def test_registered_extensions(self):
         for ext in [".cur", ".icns", ".tif", ".tiff"]:
             assert ext in extensions
 
+    def test_no_convert_mode(self):
+        self.assertTrue(not hasattr(TiffImagePlugin, "_convert_mode"))
+
+        temp_file = self.tempfile("temp.tiff")
+
+        im = hopper()
+        im.save(temp_file, convert_mode=True)
+
     def test_effect_mandelbrot(self):
         # Arrange
         size = (512, 512)
diff --git a/src/PIL/GifImagePlugin.py b/src/PIL/GifImagePlugin.py
index 248c37ba16c..eab0f790468 100644
--- a/src/PIL/GifImagePlugin.py
+++ b/src/PIL/GifImagePlugin.py
@@ -872,6 +872,13 @@ def write(self, data):
     return fp.data
 
 
+def _convert_mode(im):
+    return {
+        'LA':'P',
+        'CMYK':'RGB'
+    }.get(im.mode)
+
+
 # --------------------------------------------------------------------
 # Registry
 
diff --git a/src/PIL/Image.py b/src/PIL/Image.py
index db639f5248c..5ce1ad04440 100644
--- a/src/PIL/Image.py
+++ b/src/PIL/Image.py
@@ -2115,10 +2115,6 @@ def save(self, fp, format=None, **params):
         # may mutate self!
         self._ensure_mutable()
 
-        save_all = params.pop("save_all", False)
-        self.encoderinfo = params
-        self.encoderconfig = ()
-
         preinit()
 
         ext = os.path.splitext(filename)[1].lower()
@@ -2133,11 +2129,20 @@ def save(self, fp, format=None, **params):
 
         if format.upper() not in SAVE:
             init()
-        if save_all:
+        if params.pop('save_all', False):
             save_handler = SAVE_ALL[format.upper()]
         else:
             save_handler = SAVE[format.upper()]
 
+        if params.get('convert_mode'):
+            plugin = sys.modules[save_handler.__module__]
+            converted_im = self._convert_mode(plugin, params)
+            if converted_im:
+                return converted_im.save(fp, format, **params)
+
+        self.encoderinfo = params
+        self.encoderconfig = ()
+
         if open_fp:
             if params.get("append", False):
                 # Open also for reading ("+"), because TIFF save_all
@@ -2153,6 +2158,37 @@ def save(self, fp, format=None, **params):
             if open_fp:
                 fp.close()
 
+    def _convert_mode(self, plugin, params):
+        if not hasattr(plugin, '_convert_mode'):
+            return
+        new_mode = plugin._convert_mode(self)
+        if self.mode == 'LA' and new_mode == 'P':
+            alpha = self.getchannel('A')
+            # Convert the image into P mode but only use 255 colors
+            # in the palette out of 256.
+            im = self.convert('L') \
+                .convert('P', palette=ADAPTIVE, colors=255)
+            # Set all pixel values below 128 to 255, and the rest to 0.
+            mask = eval(alpha, lambda px: 255 if px < 128 else 0)
+            # Paste the color of index 255 and use alpha as a mask.
+            im.paste(255, mask)
+            # The transparency index is 255.
+            im.info['transparency'] = 255
+            return im
+
+        elif self.mode == 'I':
+            im = self.point([i//256 for i in range(65536)], 'L')
+            return im.convert(new_mode) if new_mode != 'L' else im
+
+        elif self.mode in ('RGBA', 'LA') and new_mode in ('RGB', 'L'):
+            fill_color = params.get('fill_color', 'white')
+            background = new(new_mode, self.size, fill_color)
+            background.paste(self, self.getchannel('A'))
+            return background
+
+        elif new_mode:
+            return self.convert(new_mode)
+
     def seek(self, frame):
         """
         Seeks to the given frame in this sequence file. If you seek
diff --git a/src/PIL/JpegImagePlugin.py b/src/PIL/JpegImagePlugin.py
index e2f7da9aff6..b93b9372251 100644
--- a/src/PIL/JpegImagePlugin.py
+++ b/src/PIL/JpegImagePlugin.py
@@ -801,6 +801,17 @@ def jpeg_factory(fp=None, filename=None):
     return im
 
 
+def _convert_mode(im):
+    mode = im.mode
+    if mode == 'P':
+        return 'RGBA' if 'A' in im.im.getpalettemode() else 'RGB'
+    return {
+        'RGBA':'RGB',
+        'LA':'L',
+        'I':'L'
+    }.get(mode)
+
+
 # ---------------------------------------------------------------------
 # Registry stuff
 
diff --git a/src/PIL/PngImagePlugin.py b/src/PIL/PngImagePlugin.py
index 0c53a031b5e..40c20bc8910 100644
--- a/src/PIL/PngImagePlugin.py
+++ b/src/PIL/PngImagePlugin.py
@@ -1355,6 +1355,12 @@ def append(fp, cid, *data):
     return fp.data
 
 
+def _convert_mode(im):
+    return {
+        'CMYK':'RGB'
+    }.get(im.mode)
+
+
 # --------------------------------------------------------------------
 # Registry
 
diff --git a/src/PIL/WebPImagePlugin.py b/src/PIL/WebPImagePlugin.py
index 2e9746fa3ff..b76b3de223e 100644
--- a/src/PIL/WebPImagePlugin.py
+++ b/src/PIL/WebPImagePlugin.py
@@ -342,6 +342,19 @@ def _save(im, fp, filename):
     fp.write(data)
 
 
+def _convert_mode(im):
+    mode = im.mode
+    if mode == 'P':
+        return 'RGBA' if 'A' in im.im.getpalettemode() else 'RGB'
+    return {
+        # Pillow doesn't support L modes for webp for now.
+        'L':'RGB',
+        'LA':'RGBA',
+        'I':'RGB',
+        'CMYK':'RGB'
+    }.get(mode)
+
+
 Image.register_open(WebPImageFile.format, WebPImageFile, _accept)
 if SUPPORTED:
     Image.register_save(WebPImageFile.format, _save)