From 02a2e93703cb3b7927b010c2e7d4b48e8e0aab2e Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Wed, 29 May 2019 21:05:45 +1000
Subject: [PATCH] Do not load ICO if already loaded

---
 Tests/images/hopper_draw.ico | Bin 0 -> 846 bytes
 Tests/test_file_ico.py       |  15 ++++++++++++++-
 src/PIL/IcoImagePlugin.py    |   3 +++
 3 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 Tests/images/hopper_draw.ico

diff --git a/Tests/images/hopper_draw.ico b/Tests/images/hopper_draw.ico
new file mode 100644
index 0000000000000000000000000000000000000000..01471189693b0e157fd311ab93e1fcd268d47121
GIT binary patch
literal 846
zcmV-U1F`%70096201yxW0000W05}5x02TlM0EtjeM-2)Z3IG5A4M|8uQUCw|5C8xG
z5C{eU001BJ|6u?C0{=-wK~#90Et5@eRAm^3ujhTwdCxgBoleKrenC4;X`wC9A|*Da
zjj}N4!i0^{g*&2QixK@3>Q7MDMiUb?F|LRULq#_xVnmcmrxsf1*YwQinRy=<;}5v6
z`(E6aD5#Nszz~H2v29_)JacCj$h>E-?nuLB>a{jv6jV@EtPz4J!7MJU;<bu%30_-t
zJUoAPlH<MK`RLs>UOt_2ZMDL}xiUWMBBF=^kCJ5>QY=jB$j}J)HhyMtdWQRz3hi!&
z3k1R7!hpbd>Yb2a>`j7b7_<w<BE}I^(><!`0mc;Z5B|bgg8-v(M62V84760(Z`LSE
zip$T^&1!%J55daPbNumOlWKZEXcMw-gR7^8xjHq-Yv(7pb8nm5j}Q6$VU<Id5X2$I
zI)o6!5^Pi|3>5Oz8;6K0OU0O9|K8=5gOqX8X6vxc=5CcMCCg96kS9?d=LGcus1WSz
zKkCu&SmSy9{7Js(H28k~5x0vamh!MPnD9@n&AKh&!Vv4j9so<w7sb@u8KAuJ;w8%C
zO@92X!T#b9*T4LQ4`)XxgdMiWPExlMSl<K%w1bFXy1s+rNi<{CH%XuF@NZ=oLc^`K
zDc--ogU<#0kez|3gwYH{!5CB(5ed`*7qrWzLd4vh<-5%eW4Rm;k6ZKwhOZu{3{Aeo
z`0{mvFd=KFWQ`iAL0pv6cV;K}_U@k?iExbKqC7VjN_>5Ho2gvLGfRtndg~6(_0d0i
zk%96Wxxou`npKEhtcAY3_AVw0qRz#-{>jJs!ThuO&5gHoWo1nPRZtP5My%!srgi?+
z&y>khzXEE+s1c(gq9US~FJIAI9P8-FxW;j!B1WwVwC9dh5u+y--&QV846D!!0Scn>
zKj^(1H+AOJ>0W{9g%HzQf@oprteU5_CW<mso@Q<N1xANPP*tKRVg5v!t;!Z6hJ4^S
zmmg--B}B&dWNPjs#U$3FMhh2)L@okV(nbwIFvigJ9xK9pu8(G6nBvh68?8EfzKg2z
YAH<qVq-TTcKmY&$07*qoM6N<$g6+bQtpET3

literal 0
HcmV?d00001

diff --git a/Tests/test_file_ico.py b/Tests/test_file_ico.py
index 97fb781b3..53875eb72 100644
--- a/Tests/test_file_ico.py
+++ b/Tests/test_file_ico.py
@@ -1,7 +1,7 @@
 from .helper import PillowTestCase, hopper
 
 import io
-from PIL import Image, IcoImagePlugin
+from PIL import Image, ImageDraw, IcoImagePlugin
 
 TEST_ICO_FILE = "Tests/images/hopper.ico"
 
@@ -90,3 +90,16 @@ class TestFileIco(PillowTestCase):
         im = self.assert_warning(UserWarning,
                                  Image.open, "Tests/images/hopper_unexpected.ico")
         self.assertEqual(im.size, (16, 16))
+
+    def test_draw_reloaded(self):
+        im = Image.open(TEST_ICO_FILE)
+        outfile = self.tempfile("temp_saved_hopper_draw.ico")
+
+        draw = ImageDraw.Draw(im)
+        draw.line((0, 0) + im.size, '#f00')
+        im.save(outfile)
+
+        im = Image.open(outfile)
+        im.save("Tests/images/hopper_draw.ico")
+        reloaded = Image.open("Tests/images/hopper_draw.ico")
+        self.assert_image_equal(im, reloaded)
diff --git a/src/PIL/IcoImagePlugin.py b/src/PIL/IcoImagePlugin.py
index 5ffc86ea7..d6a6bc9d3 100644
--- a/src/PIL/IcoImagePlugin.py
+++ b/src/PIL/IcoImagePlugin.py
@@ -288,6 +288,9 @@ class IcoImageFile(ImageFile.ImageFile):
         self._size = value
 
     def load(self):
+        if self.im and self.im.size == self.size:
+            # Already loaded
+            return
         im = self.ico.getimage(self.size)
         # if tile is PNG, it won't really be loaded yet
         im.load()