Simplify setimage() by always using extents

Author: radarhere

Tests/test_imagefile.py

@@ -295,19 +295,6 @@ def test_setimage(self) -> None:
         with pytest.raises(ValueError):
             MockPyDecoder.last.set_as_raw(b"\x00")
 
-    def test_extents_none(self) -> None:
-        buf = BytesIO(b"\x00" * 255)
-
-        im = MockImageFile(buf)
-        im.tile = [ImageFile._Tile("MOCK", None, 32, None)]
-
-        im.load()
-
-        assert MockPyDecoder.last.state.xoff == 0
-        assert MockPyDecoder.last.state.yoff == 0
-        assert MockPyDecoder.last.state.xsize == 200
-        assert MockPyDecoder.last.state.ysize == 200
-
     def test_negsize(self) -> None:
         buf = BytesIO(b"\x00" * 255)
 
@@ -371,21 +358,6 @@ def test_setimage(self) -> None:
         assert MockPyEncoder.last.state.xsize == xsize
         assert MockPyEncoder.last.state.ysize == ysize
 
-    def test_extents_none(self) -> None:
-        buf = BytesIO(b"\x00" * 255)
-
-        im = MockImageFile(buf)
-        im.tile = [ImageFile._Tile("MOCK", None, 32, None)]
-
-        fp = BytesIO()
-        ImageFile._save(im, fp, [ImageFile._Tile("MOCK", None, 0, "RGB")])
-
-        assert MockPyEncoder.last
-        assert MockPyEncoder.last.state.xoff == 0
-        assert MockPyEncoder.last.state.yoff == 0
-        assert MockPyEncoder.last.state.xsize == 200
-        assert MockPyEncoder.last.state.ysize == 200
-
     def test_negsize(self) -> None:
         buf = BytesIO(b"\x00" * 255)
 

src/PIL/ImageFile.py

@@ -101,7 +101,7 @@ def _tilesort(t: _Tile) -> int:
 
 class _Tile(NamedTuple):
     codec_name: str
-    extents: tuple[int, int, int, int] | None
+    extents: tuple[int, int, int, int]
     offset: int = 0
     args: tuple[Any, ...] | str | None = None
 
@@ -783,7 +783,7 @@ def setfd(self, fd: IO[bytes]) -> None:
     def setimage(
         self,
         im: Image.core.ImagingCore,
-        extents: tuple[int, int, int, int] | None = None,
+        extents: tuple[int, int, int, int],
     ) -> None:
         """
         Called from ImageFile to set the core output image for the codec
@@ -797,18 +797,12 @@ def setimage(
         # following c code
         self.im = im
 
-        if extents:
-            x0, y0, x1, y1 = extents
-        else:
-            x0, y0, x1, y1 = (0, 0, 0, 0)
+        x0, y0, x1, y1 = extents
 
-        if x0 == 0 and x1 == 0:
-            self.state.xsize, self.state.ysize = self.im.size
-        else:
-            self.state.xoff = x0
-            self.state.yoff = y0
-            self.state.xsize = x1 - x0
-            self.state.ysize = y1 - y0
+        self.state.xoff = x0
+        self.state.yoff = y0
+        self.state.xsize = x1 - x0
+        self.state.ysize = y1 - y0
 
         if self.state.xsize <= 0 or self.state.ysize <= 0:
             msg = "Size must be positive"