pillow-avif-plugin 1.2.1__cp310-cp310-win_amd64.whl → 1.4.4__cp310-cp310-win_amd64.whl

pillow_avif/AvifImagePlugin.py

@@ -3,7 +3,7 @@ from __future__ import division
 from io import BytesIO
 import sys
 
-from PIL import Image, ImageFile
+from PIL import ExifTags, Image, ImageFile
 
 try:
     from pillow_avif import _avif
@@ -16,6 +16,7 @@ except ImportError:
 # to Image.open (see https://github.com/python-pillow/Pillow/issues/569)
 DECODE_CODEC_CHOICE = "auto"
 CHROMA_UPSAMPLING = "auto"
+DEFAULT_MAX_THREADS = 0
 
 _VALID_AVIF_MODES = {"RGB", "RGBA"}
 
@@ -51,15 +52,17 @@ def _accept(prefix):
 
 
 class AvifImageFile(ImageFile.ImageFile):
-
     format = "AVIF"
     format_description = "AVIF image"
     __loaded = -1
     __frame = 0
 
+    def load_seek(self, pos):
+        pass
+
     def _open(self):
         self._decoder = _avif.AvifDecoder(
-            self.fp.read(), DECODE_CODEC_CHOICE, CHROMA_UPSAMPLING
+            self.fp.read(), DECODE_CODEC_CHOICE, CHROMA_UPSAMPLING, DEFAULT_MAX_THREADS
         )
 
         # Get info from decoder
@@ -67,7 +70,10 @@ class AvifImageFile(ImageFile.ImageFile):
         self._size = width, height
         self.n_frames = n_frames
         self.is_animated = self.n_frames > 1
-        self.mode = self.rawmode = mode
+        try:
+            self.mode = self.rawmode = mode
+        except AttributeError:
+            self._mode = self.rawmode = mode
         self.tile = []
 
         if icc:
@@ -124,41 +130,45 @@ def _save(im, fp, filename, save_all=False):
 
     is_single_frame = total == 1
 
-    qmin = info.get("qmin")
-    qmax = info.get("qmax")
-
-    if qmin is None and qmax is None:
-        # The min and max quantizer settings in libavif range from 0 (best quality)
-        # to 63 (worst quality). If neither are explicitly specified, we use a 0-100
-        # quality scale (default 90) and calculate the qmin and qmax from that.
-        #
-        # - qmin is 0 for quality >= 64. Below that, qmin has an inverse linear
-        #   relation to quality (i.e., quality 63 = qmin 1, quality 0 => qmin 63)
-        # - qmax is 0 for quality=100, then qmax increases linearly relative to
-        #   quality decreasing, until it flattens out at quality=37.
-        quality = info.get("quality", 90)
-        if not isinstance(quality, int):
-            raise ValueError("Invalid quality setting")
-        qmin = max(0, min(64 - quality, 63))
-        qmax = max(0, min(100 - quality, 63))
+    qmin = info.get("qmin", -1)
+    qmax = info.get("qmax", -1)
+    quality = info.get("quality", 75)
+    if not isinstance(quality, int) or quality < 0 or quality > 100:
+        raise ValueError("Invalid quality setting")
 
     duration = info.get("duration", 0)
     subsampling = info.get("subsampling", "4:2:0")
-    speed = info.get("speed", 8)
+    speed = info.get("speed", 6)
+    max_threads = info.get("max_threads", DEFAULT_MAX_THREADS)
     codec = info.get("codec", "auto")
     range_ = info.get("range", "full")
     tile_rows_log2 = info.get("tile_rows", 0)
-    tile_cols_log2 = info.get("tile_rows", 0)
+    tile_cols_log2 = info.get("tile_cols", 0)
     alpha_premultiplied = bool(info.get("alpha_premultiplied", False))
+    autotiling = bool(info.get("autotiling", tile_rows_log2 == tile_cols_log2 == 0))
 
     icc_profile = info.get("icc_profile", im.info.get("icc_profile"))
     exif = info.get("exif", im.info.get("exif"))
     if isinstance(exif, Image.Exif):
         exif = exif.tobytes()
+
+    exif_orientation = 0
+    if exif:
+        exif_data = Image.Exif()
+        try:
+            exif_data.load(exif)
+        except SyntaxError:
+            pass
+        else:
+            orientation_tag = next(
+                k for k, v in ExifTags.TAGS.items() if v == "Orientation"
+            )
+            exif_orientation = exif_data.get(orientation_tag) or 0
+
     xmp = info.get("xmp", im.info.get("xmp") or im.info.get("XML:com.adobe.xmp"))
 
     if isinstance(xmp, text_type):
-        xmp = xmp.encode('utf-8')
+        xmp = xmp.encode("utf-8")
 
     advanced = info.get("advanced")
     if isinstance(advanced, dict):
@@ -173,10 +183,11 @@ def _save(im, fp, filename, save_all=False):
         if invalid:
             raise ValueError(
                 "advanced codec options must be a dict of key-value string "
-                "pairs or a series of key-value two-tuples")
-        advanced = tuple([
-            (str(k).encode("utf-8"), str(v).encode("utf-8"))
-            for k, v in advanced])
+                "pairs or a series of key-value two-tuples"
+            )
+        advanced = tuple(
+            [(str(k).encode("utf-8"), str(v).encode("utf-8")) for k, v in advanced]
+        )
 
     # Setup the AVIF encoder
     enc = _avif.AvifEncoder(
@@ -185,16 +196,20 @@ def _save(im, fp, filename, save_all=False):
         subsampling,
         qmin,
         qmax,
+        quality,
         speed,
+        max_threads,
         codec,
         range_,
         tile_rows_log2,
         tile_cols_log2,
         alpha_premultiplied,
+        autotiling,
         icc_profile or b"",
         exif or b"",
+        exif_orientation,
         xmp or b"",
-        advanced
+        advanced,
     )
 
     # Add each frame
@@ -218,6 +233,10 @@ def _save(im, fp, filename, save_all=False):
                         "A" in ims.mode
                         or "a" in ims.mode
                         or (ims.mode == "P" and "A" in ims.im.getpalettemode())
+                        or (
+                            ims.mode == "P"
+                            and ims.info.get("transparency", None) is not None
+                        )
                     )
                     rawmode = "RGBA" if alpha else "RGB"
                     frame = ims.convert(rawmode)

pillow_avif/__init__.py

@@ -1,5 +1,5 @@
 from . import AvifImagePlugin
 
 
-__all__ = ['AvifImagePlugin']
-__version__ = '1.2.1'
+__all__ = ["AvifImagePlugin"]
+__version__ = "1.4.4"

{pillow_avif_plugin-1.2.1.dist-info → pillow_avif_plugin-1.4.4.dist-info}/METADATA

@@ -1,38 +1,36 @@
-Metadata-Version: 2.1
-Name: pillow-avif-plugin
-Version: 1.2.1
-Summary: A pillow plugin that adds avif support via libavif
-Home-page: https://github.com/fdintino/pillow-avif-plugin/
-Author: Frankie Dintino
-Author-email: fdintino@theatlantic.com
-License: MIT License
-Download-URL: https://github.com/fdintino/pillow-avif-plugin/releases
-Platform: UNKNOWN
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Environment :: Web Environment
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: C
-Classifier: Programming Language :: C++
-Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: Implementation :: CPython
-Classifier: Programming Language :: Python :: Implementation :: PyPy
-Classifier: Topic :: Multimedia :: Graphics
-Classifier: Topic :: Multimedia :: Graphics :: Graphics Conversion
-Description-Content-Type: text/markdown
-License-File: LICENSE
-
-# pillow-avif-plugin
-
-This is a plugin that adds support for AVIF files until official support has been added (see [this pull request](https://github.com/python-pillow/Pillow/pull/5201)).
-
-To register this plugin with pillow you will need to add `import pillow_avif` somewhere in your application.
-
-
+Metadata-Version: 2.1
+Name: pillow-avif-plugin
+Version: 1.4.4
+Summary: A pillow plugin that adds avif support via libavif
+Home-page: https://github.com/fdintino/pillow-avif-plugin/
+Download-URL: https://github.com/fdintino/pillow-avif-plugin/releases
+Author: Frankie Dintino
+Author-email: fdintino@theatlantic.com
+License: MIT License
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Web Environment
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: C
+Classifier: Programming Language :: C++
+Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
+Classifier: Topic :: Multimedia :: Graphics
+Classifier: Topic :: Multimedia :: Graphics :: Graphics Conversion
+Description-Content-Type: text/markdown
+License-File: LICENSE
+
+# pillow-avif-plugin
+
+This is a plugin that adds support for AVIF files until official support has been added (see [this pull request](https://github.com/python-pillow/Pillow/pull/5201)).
+
+To register this plugin with pillow you will need to add `import pillow_avif` somewhere in your application.

pillow_avif_plugin-1.4.4.dist-info/RECORD

@@ -0,0 +1,9 @@
+pillow_avif/AvifImagePlugin.py,sha256=frEKrbOSyxbVr4HCqjo0SgJxKLQ6lYvBO_8rg1PLsSo,8768
+pillow_avif/__init__.py,sha256=7sAPSp1nzlfosFByw6n2fjTsQbYfQGPRrfsg72wIgxw,89
+pillow_avif/_avif.cp310-win_amd64.pyd,sha256=17pmSu4qYQ65tlM1rlzEDzkYkcCGpJ-8jgKseocLkOE,27896832
+pillow_avif_plugin-1.4.4.dist-info/LICENSE,sha256=tubzK3TFrT8GFgUPEKC-WmCziD1dGOFLCjDky3t9Lnc,1321
+pillow_avif_plugin-1.4.4.dist-info/METADATA,sha256=hVrEQfrHp1oCYSBeRcAhLyS7Up2R0N0YuLjvKqgN0DA,1704
+pillow_avif_plugin-1.4.4.dist-info/WHEEL,sha256=UZYoTfvcH9CL8oQkujTAI06MiAXK9kd09pSK3OpCC7k,101
+pillow_avif_plugin-1.4.4.dist-info/top_level.txt,sha256=xrg4zRnqDyl_JEyEQh3oCcAU4BHneocD-DCFDzf4g9E,12
+pillow_avif_plugin-1.4.4.dist-info/zip-safe,sha256=frcCV1k9oG9oKj3dpUqdJg1PxRT2RSN_XKdLCPjaYaY,2
+pillow_avif_plugin-1.4.4.dist-info/RECORD,,

{pillow_avif_plugin-1.2.1.dist-info → pillow_avif_plugin-1.4.4.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.37.0)
+Generator: setuptools (70.2.0)
 Root-Is-Purelib: false
 Tag: cp310-cp310-win_amd64
 

pillow_avif_plugin-1.2.1.dist-info/RECORD

@@ -1,9 +0,0 @@
-pillow_avif/AvifImagePlugin.py,sha256=FEpA1ktnlRFsRmwI8-rCzq15tZozMymj0E4FWE0P9vA,8440
-pillow_avif/__init__.py,sha256=9naq-agRCo3wFdZattLuZuC9yg_wX6eO4bb3ry3CGUo,89
-pillow_avif/_avif.cp310-win_amd64.pyd,sha256=pL8x5cUwg0HNJBDhiE3KSJ8Wj48ggacKUlYct7TLkCI,17286656
-pillow_avif_plugin-1.2.1.dist-info/LICENSE,sha256=tubzK3TFrT8GFgUPEKC-WmCziD1dGOFLCjDky3t9Lnc,1321
-pillow_avif_plugin-1.2.1.dist-info/METADATA,sha256=_y94PFO1BjNmlJ6ivnT6bzzWYdYIcryOxQ9GM0YK7mQ,1636
-pillow_avif_plugin-1.2.1.dist-info/WHEEL,sha256=C6CHup2HLC2Rld8AL5u9w89MYULjdaP5k0k7SG83CcI,102
-pillow_avif_plugin-1.2.1.dist-info/top_level.txt,sha256=xrg4zRnqDyl_JEyEQh3oCcAU4BHneocD-DCFDzf4g9E,12
-pillow_avif_plugin-1.2.1.dist-info/zip-safe,sha256=frcCV1k9oG9oKj3dpUqdJg1PxRT2RSN_XKdLCPjaYaY,2
-pillow_avif_plugin-1.2.1.dist-info/RECORD,,