Merge 5cd6659 into 5fa7791

Tests/test_file_icns.py

@@ -22,8 +22,7 @@ def test_sanity(self):
         self.assertEqual(im.size, (1024, 1024))
         self.assertEqual(im.format, "ICNS")
 
-    @unittest.skipIf(sys.platform != 'darwin',
-                     "requires MacOS")
+    @unittest.skipIf(sys.platform != 'darwin', "requires MacOS")
     def test_save(self):
         im = Image.open(TEST_FILE)
 
@@ -36,6 +35,22 @@ def test_save(self):
         self.assertEqual(reread.size, (1024, 1024))
         self.assertEqual(reread.format, "ICNS")
 
+    @unittest.skipIf(sys.platform != 'darwin', "requires MacOS")
+    def test_save_append_images(self):
+        im = Image.open(TEST_FILE)
+
+        temp_file = self.tempfile("temp.icns")
+        providedIm = Image.new('RGBA', (32, 32), (255, 0, 0, 0))
+        im.save(temp_file, append_images=[providedIm])
+
+        reread = Image.open(temp_file)
+        self.assert_image_equal(reread, im)
+
+        reread = Image.open(temp_file)
+        reread.size = (16, 16, 2)
+        reread.load()
+        self.assert_image_equal(reread, providedIm)
+
     def test_sizes(self):
         # Check that we can load all of the sizes, and that the final pixel
         # dimensions are as expected

src/PIL/IcnsImagePlugin.py

@@ -310,6 +310,8 @@ def _save(im, fp, filename):
 
     # create the temporary set of pngs
     iconset = tempfile.mkdtemp('.iconset')
+    providedImages = {im.width:im for im in
+                      im.encoderinfo.get("append_images", [])}
     last_w = None
     last_im = None
     for w in [16, 32, 128, 256, 512]:
@@ -318,10 +320,10 @@ def _save(im, fp, filename):
         if last_w == w:
             im_scaled = last_im
         else:
-            im_scaled = im.resize((w, w), Image.LANCZOS)
+            im_scaled = providedImages.get(w, im.resize((w, w), Image.LANCZOS))
         im_scaled.save(os.path.join(iconset, prefix+'.png'))
 
-        im_scaled = im.resize((w*2, w*2), Image.LANCZOS)
+        im_scaled = providedImages.get(w*2, im.resize((w*2, w*2), Image.LANCZOS))
         im_scaled.save(os.path.join(iconset, prefix+'@2x.png'))
         last_im = im_scaled