Merge pull request #6117 from radarhere/return

python-pillow · Mar 10, 2022 · 5c931de · 5c931de
2 parents 0639609 + e87432b
commit 5c931de
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/PIL/BlpImagePlugin.py b/src/PIL/BlpImagePlugin.py
@@ -306,7 +306,7 @@ def decode(self, buffer):
             self._load()
         except struct.error as e:
             raise OSError("Truncated BLP file") from e
-        return 0, 0
+        return -1, 0
 
     def _read_blp_header(self):
         self.fd.seek(4)

diff --git a/src/PIL/ImageFile.py b/src/PIL/ImageFile.py
@@ -231,7 +231,7 @@ def load(self):
                     decoder.setimage(self.im, extents)
                     if decoder.pulls_fd:
                         decoder.setfd(self.fp)
-                        status, err_code = decoder.decode(b"")
+                        err_code = decoder.decode(b"")[1]
                     else:
                         b = prefix
                         while True:
@@ -664,7 +664,7 @@ def decode(self, buffer):
 
         :param buffer: A bytes object with the data to be decoded.
         :returns: A tuple of ``(bytes consumed, errcode)``.
-            If finished with decoding return 0 for the bytes consumed.
+            If finished with decoding return -1 for the bytes consumed.
             Err codes are from :data:`.ImageFile.ERRORS`.
         """
         raise NotImplementedError()

diff --git a/src/PIL/MspImagePlugin.py b/src/PIL/MspImagePlugin.py
@@ -148,7 +148,7 @@ def decode(self, buffer):
 
         self.set_as_raw(img.getvalue(), ("1", 0, 1))
 
-        return 0, 0
+        return -1, 0
 
 
 Image.register_decoder("MSP", MspDecoder)