Merge pull request #6678 from radarhere/blp1

python-pillow · Oct 23, 2022 · 9887544 · 9887544
2 parents eca2f5c + f7363c1
commit 9887544
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/Tests/images/blp/blp1_jpeg2.blp b/Tests/images/blp/blp1_jpeg2.blp
diff --git 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
@@ -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())