From 261a7281cc6b2b5d86a33a103f13ba0070674d48 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Sun, 1 Oct 2023 22:51:04 +1100
Subject: [PATCH] Added support for reading all Windows 1 formats

---
 Tests/images/ico1both.ico                        | Bin 0 -> 1306 bytes
 Tests/images/ico1device_dependent.ico            | Bin 0 -> 1038 bytes
 .../{ico1.ico => ico1device_independent.ico}     | Bin
 Tests/test_file_ico.py                           |  14 ++++++++++++--
 docs/handbook/image-file-formats.rst             |   3 ++-
 src/PIL/IcoImagePlugin.py                        |   2 +-
 6 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100644 Tests/images/ico1both.ico
 create mode 100644 Tests/images/ico1device_dependent.ico
 rename Tests/images/{ico1.ico => ico1device_independent.ico} (100%)

diff --git a/Tests/images/ico1both.ico b/Tests/images/ico1both.ico
new file mode 100644
index 0000000000000000000000000000000000000000..d0c95b70ca5cc4fe174168690bf55fc564bc6721
GIT binary patch
literal 1306
zcmaiy!HU#C5QZxgnF;Q&EqGZ_cJ`)6UqGfs5D$W{FgG8-g9u{s0^%d=LwFED>^y;c
z)SH1l>@~~ok_;p%|LU$L**WZV`1AE&U6oWioy;E4oGh-4h)y|-NTdFV@|*I9@~84w
z9wsjE%B@KPjXU+caA(vm#9vT5Px!mLq5^E(mI_Mx#&yDTb_1G7{;}f~m^Y69fDC^r
zgzqTrg*+wJZ~3?`@k;Zn6b-?b@G%~}<i~g!-otm%*G=-o*Xp_S{W1?D<@x))@!!P*
zHr?lsKGg5=c!jS6ZloR~^4fXJwX)suF<x)5{W3QGPE;%ZD&HtyDPJmI6k%cmm$qaH
zWOn0uWS{Y(6@SEw?Le>Xl5;S#bIy5~Wi}N)CW}4e;RL6#0*lPjQ;^^fh43kNGa*fh
z^;<r!OWbI_>CljR;R<o^K!|+fg2(3j_pFp_Wj-b9;=0d=PtQUf(c1Tm<2q9M+3&dy
zc{oZwfAleaC&`35@V?YzL>^dg$tV{)KE_Q(DV^ZDhkSfF<16_s^bY!9xPQM~Z9fv-
zd?Nbtndo_5P@h-FeO{|tusvo7#M)F`;3rr8sB_Gx;x6Y=(sCiU>5v0?`J1T0=6;2Y
fs2Y`GE_w*bkH{h6BZv-nWJ(mOQqYeCcTxHufv0|3

literal 0
HcmV?d00001

diff --git a/Tests/images/ico1device_dependent.ico b/Tests/images/ico1device_dependent.ico
new file mode 100644
index 0000000000000000000000000000000000000000..8a6a9f2e0b361bd9fba974c9ac460c78d3f51106
GIT binary patch
literal 1038
zcmaiy&q~8U5QirXG{F|*u?L~v^ynLOMGy}@MBgNNlRkt85yb5q^r$xr9(s*bNegMl
z-|Wtkw1;*J`SQ)5?qu00x}ZK8{8A#Cv0s6i`nB>|`Ko+VzUThMdamt+Bv9Fz<H{~*
zlZdZq(~tPYuBiYkyQPAnU1e+GH`@k7L|<%q4Ca;P50K$MLU>K_PRLy%zvm$@@uk);
zV+;hJ!$Ul{)Q9-o@59IF`Z{&ur8>{uyv$8Y`Tx_Nx$oizhwkcI_x&dvTev>pPx`R}
zf2~t4m74<(@p6jemo;@yqEh*(d{RCr@0E9je=(jzGiM2;X6iUHx14OmN1SXMdNf1M
z!PN9Q=cbpMSa?YWXU5GHZsQUxQbRW&!Ow;8nCqU9x<r1@Ltf&U)@L;aQWuU92M0pb
zXVyCo-|aJ2PLz3<=nHvQ504kVk7(lN#dU2d^PF}reI2fnt8YETkCHOq2cAhkR^Y%m
LrA(O|c!+2Jo7NC}

literal 0
HcmV?d00001

diff --git a/Tests/images/ico1.ico b/Tests/images/ico1device_independent.ico
similarity index 100%
rename from Tests/images/ico1.ico
rename to Tests/images/ico1device_independent.ico
diff --git a/Tests/test_file_ico.py b/Tests/test_file_ico.py
index 7c5dd0739f6..e4b8bd62a0f 100644
--- a/Tests/test_file_ico.py
+++ b/Tests/test_file_ico.py
@@ -229,10 +229,20 @@ def test_draw_reloaded(tmp_path):
         assert_image_equal_tofile(im, "Tests/images/hopper_draw.ico")
 
 
-def test_ico1_open():
-    with Image.open("Tests/images/ico1.ico") as im:
+@pytest.mark.parametrize(
+    "test_image_path",
+    (
+        "Tests/images/ico1device_independent.ico",
+        "Tests/images/ico1device_dependent.ico",
+        "Tests/images/ico1both.ico",
+    ),
+)
+def test_ico1_open(test_image_path):
+    with Image.open(test_image_path) as im:
         assert_image_equal_tofile(im, "Tests/images/ico1.png")
 
+
+def test_ico1_invalid_file():
     with open("Tests/images/flower.jpg", "rb") as fp:
         with pytest.raises(SyntaxError):
             IcoImagePlugin.Ico1ImageFile(fp)
diff --git a/docs/handbook/image-file-formats.rst b/docs/handbook/image-file-formats.rst
index d92978c4a27..ca980a764af 100644
--- a/docs/handbook/image-file-formats.rst
+++ b/docs/handbook/image-file-formats.rst
@@ -345,7 +345,8 @@ The :py:meth:`~PIL.Image.Image.save` method can take the following keyword argum
 ICO1
 ^^^^
 
-Pillow also reads and writes device-independent Windows 1.0 icons.
+Pillow also reads Windows 1.0 icons in all three formats ("Device-Independent",
+"Device-Dependent" and "Both"), and writes them in "Device-Independent" format.
 
 .. versionadded:: 10.1.0
 
diff --git a/src/PIL/IcoImagePlugin.py b/src/PIL/IcoImagePlugin.py
index 53470802498..d1a88f396b2 100644
--- a/src/PIL/IcoImagePlugin.py
+++ b/src/PIL/IcoImagePlugin.py
@@ -349,7 +349,7 @@ def load_seek(self):
 
 
 def _ico1_accept(prefix):
-    return prefix[:2] == b"\1\0"
+    return prefix[0] == 1 and prefix[1] in (0, 1, 2)
 
 
 class Ico1ImageFile(ImageFile.ImageFile):