Merge 1e365d8c72 into 7e4d8e2f55

Tests/test_file_ico.py

@@ -99,6 +99,7 @@ def test_getpixel(tmp_path: Path) -> None:
         reloaded.load()
         reloaded.size = (32, 32)
 
+        assert reloaded.load() is not None
         assert reloaded.getpixel((0, 0)) == (18, 20, 62)
 
 

Tests/test_file_iptc.py

@@ -23,6 +23,9 @@ def test_open() -> None:
         assert im.tile == [("iptc", (0, 0, 1, 1), 25, "raw")]
         assert_image_equal(im, expected)
 
+    with Image.open(f) as im:
+        assert im.load() is not None
+
 
 def test_getiptcinfo_jpg_none() -> None:
     # Arrange

src/PIL/IcoImagePlugin.py

@@ -362,7 +362,7 @@ class IcoImageFile(ImageFile.ImageFile):
             self.info["sizes"] = set(sizes)
 
             self.size = im.size
-        return None
+        return Image.Image.load(self)
 
     def load_seek(self, pos: int) -> None:
         # Flag the ImageFile.Parser so that it

src/PIL/IptcImagePlugin.py

@@ -179,7 +179,8 @@ class IptcImageFile(ImageFile.ImageFile):
         with Image.open(o) as _im:
             _im.load()
             self.im = _im.im
-        return None
+        self.tile = []
+        return Image.Image.load(self)
 
 
 Image.register_open(IptcImageFile.format, IptcImageFile)