From f7363c1091c70356d92e56abfca6b65bef9e7b26 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Sat, 15 Oct 2022 22:30:53 +1100
Subject: [PATCH] Decode JPEG compressed BLP1 data in original mode

---
 Tests/images/blp/blp1_jpeg2.blp | Bin 0 -> 2834 bytes
 Tests/test_file_blp.py          |   3 +++
 src/PIL/BlpImagePlugin.py       |   4 ++--
 3 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 Tests/images/blp/blp1_jpeg2.blp

diff --git a/Tests/images/blp/blp1_jpeg2.blp b/Tests/images/blp/blp1_jpeg2.blp
new file mode 100644
index 0000000000000000000000000000000000000000..890180e9b479d0569213512b93d5c9caafa03be8
GIT binary patch
literal 2834
zcmZ?r2{2>;ga7YVG6ESu%nA`;5MX9t_zwj@As7>+N^AMM(@<5osgLZq<%p3fU;<it
z<NpH&0WUXCHwH$a#f%{L{r|_H<(XHKnxhe<so)jhS^-oC0+l)nWvNBQnfZANhB~G?
zCOXDu4F7L4I5UXw@eA?uiU<h^iHnLz$Qdch$;imr>gcH$c{=!byF0kK21FGn1%&2?
zxw@rvq~?}aH#Rl;CG<}3shw6_*H{BGgi%ynTuw^PT2axuCfF^whGg*n2;(B42Ur=w
z0ODdGpNW};m5rT)lZ#t`fr*isnTds&m6e4BC{qiRV_*?v6;d>GWD^cdWLGK_F>0K+
zkVDyN<3Z7&iyu^slZu)+xx~aJB&Af<)HO7<OiazpEiA2^U0mJVJv_aFLqfyCBO;@c
zQ&Q8?GcvP^OG?YiD=Mp+TUy)NJ36~2O`bA!+VmMSXDwR1Wa+ZyD^{-Bw0X<cZQFP3
z+;!;ik)y|spE!By(&Z~xuU)@!^VY*hkDok!_WZ@mS06up{_^$P_a8rhF)}biyaOa5
zK0@-3AkaTdEG*0{>>&RzGL?foE6BpCXviky7|5PjD6C}E$RXl1apA^;oXW;QA4HRi
zE^>*fm^@Vd2=WrxN5pxki7X$%Jp}j9{{svn9E=Qq7+4sAt`}rr76e8B!~a_hd@PJW
zKG5}o4E79<wGVFm*zUj(z#sz5D~xc4e*(i2G$99uzygK^3>pkvz+`)~d)wB8r)pbs
z{~XZdU}^w~I{<Y*nYh?8YK8B?yW(DJR(gH>-4H%=PQsUO%e5v=%1_El?Y!Ervu64P
zo)tzAgCsEQCEfu@hJzgiHw)y8z=G31=ig&m{djFq?ODyRZIi3Y86*EQ>~^jdcy&E&
zi`-v_H2<~Qzh-;}DPz9+@%ze^<)%yHZu!2v!<sJfsO`GbtMGpPovWE_=0}C6+uQ7)
z`S*dO-ImzziRbm7)mO0juVsWW6pHf84rq2TtCTFr^3A!$SXApP)owHIQ+)-ehl2<M
z*V?Wf{!?$h$@E&Uy!rMg#)sEtV-Gl3u=T1jFdzln<{PVaP&3#_jyGyMfT&bO?ZihD
zPtY=TbHS4{JV(G8gFkOVijqN9Tnz01{oXLsZcDM<o0w1k(!V#P{JMDN_lD=wKiltN
XRwJCDsaB$ZD+r2Wbu=H+wT=V;ZrDr9

literal 0
HcmV?d00001

diff --git a/Tests/test_file_blp.py b/Tests/test_file_blp.py
index c1fae44ca35..ba2781820e0 100644
--- a/Tests/test_file_blp.py
+++ b/Tests/test_file_blp.py
@@ -14,6 +14,9 @@ def test_load_blp1():
     with Image.open("Tests/images/blp/blp1_jpeg.blp") as im:
         assert_image_equal_tofile(im, "Tests/images/blp/blp1_jpeg.png")
 
+    with Image.open("Tests/images/blp/blp1_jpeg2.blp") as im:
+        im.load()
+
 
 def test_load_blp2_raw():
     with Image.open("Tests/images/blp/blp2_raw.blp") as im:
diff --git a/src/PIL/BlpImagePlugin.py b/src/PIL/BlpImagePlugin.py
index 104fbada950..53399773716 100644
--- a/src/PIL/BlpImagePlugin.py
+++ b/src/PIL/BlpImagePlugin.py
@@ -373,8 +373,8 @@ def _decode_jpeg_stream(self):
         data = BytesIO(data)
         image = JpegImageFile(data)
         Image._decompression_bomb_check(image.size)
-        image.mode = "RGB"
-        image.tile = [("jpeg", (0, 0) + self.size, 0, ("BGRX", ""))]
+        r, g, b = image.convert("RGB").split()
+        image = Image.merge("RGB", (b, g, r))
         self.set_as_raw(image.tobytes())