fix for #13

Author: bigcat88

pillow_heif/as_opener.py

@@ -20,8 +20,8 @@ def _open(self):
             heif_file = open_heif(self.fp)
         except HeifError as e:
             raise SyntaxError(str(e)) from None
-        if getattr(self, "_exclusive_fp", False):
-            if hasattr(self, "fp") and self.fp is not None:
+        if hasattr(self, "_exclusive_fp") and self._exclusive_fp:
+            if hasattr(self, "fp") and self.fp:
                 self.fp.close()
         self.fp = None
         self._size = heif_file.size
@@ -41,6 +41,9 @@ def _open(self):
         self.tile = []
         self.heif_file = heif_file
 
+    def verify(self) -> None:
+        pass  # we already check this in `_open`, no need to check second time.
+
     def load(self):
         if self.heif_file is not None and self.heif_file:
             heif_file = self.heif_file.load()
@@ -58,3 +61,5 @@ def check_heif_magic(data) -> bool:
 def register_heif_opener():
     Image.register_open(HeifImageFile.format, HeifImageFile, check_heif_magic)
     Image.register_mime(HeifImageFile.format, "image/heif")
+    Image.register_mime(HeifImageFile.format, "image/avif")
+    Image.register_extensions(HeifImageFile.format, [".heic", ".heif", ".avif"])

tests/test_opener.py

@@ -20,10 +20,18 @@
 @pytest.mark.parametrize("path", heic_files[:6] + hif_files[:6] + avif_files[:6])
 def test_open_image(path):
     image = Image.open(path)
-    image.load()
     assert image is not None
 
 
+@pytest.mark.parametrize("path", heic_files[:2] + hif_files[:2] + avif_files[:2])
+def test_verify(path):
+    image = Image.open(path)
+    image.verify()
+    assert image is not None
+    assert not getattr(image, "fp", None)
+    image.load()
+
+
 @pytest.mark.parametrize("path", heif_exif_test)
 def test_open_image_exif(path):
     image = Image.open(path)