pillow-avif-plugin 1.3.0__tar.gz → 1.4.0__tar.gz

pillow-avif-plugin-1.4.0/LICENSE

@@ -0,0 +1,22 @@
+Copyright (c) 2021, Frankie Dintino. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

{pillow-avif-plugin-1.3.0 → pillow-avif-plugin-1.4.0}/PKG-INFO

@@ -1,18 +1,12 @@
 Metadata-Version: 2.1
 Name: pillow-avif-plugin
-Version: 1.3.0
+Version: 1.4.0
 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
-Description: # 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.
-        
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Web Environment
@@ -23,14 +17,23 @@ 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 :: 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.0/pyproject.toml

@@ -0,0 +1,3 @@
+[build-system]
+requires = ["setuptools"]
+build-backend = "setuptools.build_meta"

{pillow-avif-plugin-1.3.0 → pillow-avif-plugin-1.4.0}/setup.py

@@ -61,12 +61,12 @@ setup(
         "Programming Language :: C++",
         "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
         "Programming Language :: Python :: Implementation :: CPython",
         "Programming Language :: Python :: Implementation :: PyPy",
         "Topic :: Multimedia :: Graphics",

{pillow-avif-plugin-1.3.0 → pillow-avif-plugin-1.4.0}/src/pillow_avif/AvifImagePlugin.py

@@ -51,7 +51,6 @@ def _accept(prefix):
 
 
 class AvifImageFile(ImageFile.ImageFile):
-
     format = "AVIF"
     format_description = "AVIF image"
     __loaded = -1
@@ -67,7 +66,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:
@@ -137,7 +139,7 @@ def _save(im, fp, filename, save_all=False):
         # - 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", 75)
-        if not isinstance(quality, int):
+        if not isinstance(quality, int) or quality < 0 or quality > 100:
             raise ValueError("Invalid quality setting")
         qmin = max(0, min(64 - quality, 63))
         qmax = max(0, min(100 - quality, 63))
@@ -187,6 +189,7 @@ def _save(im, fp, filename, save_all=False):
         subsampling,
         qmin,
         qmax,
+        quality,
         speed,
         codec,
         range_,

{pillow-avif-plugin-1.3.0 → pillow-avif-plugin-1.4.0}/src/pillow_avif/__init__.py

@@ -2,4 +2,4 @@ from . import AvifImagePlugin
 
 
 __all__ = ["AvifImagePlugin"]
-__version__ = "1.3.0"
+__version__ = "1.4.0"

{pillow-avif-plugin-1.3.0 → pillow-avif-plugin-1.4.0}/src/pillow_avif/_avif.c

@@ -13,6 +13,7 @@ typedef struct {
     avifPixelFormat subsampling;
     int qmin;
     int qmax;
+    int quality;
     int speed;
     avifCodecChoice codec;
     avifRange range;
@@ -205,6 +206,7 @@ AvifEncoderNew(PyObject *self_, PyObject *args) {
     char *subsampling = "4:2:0";
     int qmin = AVIF_QUANTIZER_BEST_QUALITY;  // =0
     int qmax = 10;                           // "High Quality", but not lossless
+    int quality = 75;
     int speed = 8;
     PyObject *icc_bytes;
     PyObject *exif_bytes;
@@ -221,12 +223,13 @@ AvifEncoderNew(PyObject *self_, PyObject *args) {
 
     if (!PyArg_ParseTuple(
             args,
-            "IIsiiissiiOOSSSO",
+            "IIsiiiissiiOOSSSO",
             &width,
             &height,
             &subsampling,
             &qmin,
             &qmax,
+            &quality,
             &speed,
             &codec,
             &range,
@@ -256,6 +259,7 @@ AvifEncoderNew(PyObject *self_, PyObject *args) {
 
     enc_options.qmin = normalize_quantize_value(qmin);
     enc_options.qmax = normalize_quantize_value(qmax);
+    enc_options.quality = quality;
 
     if (speed < AVIF_SPEED_SLOWEST) {
         speed = AVIF_SPEED_SLOWEST;
@@ -321,8 +325,12 @@ AvifEncoderNew(PyObject *self_, PyObject *args) {
         }
 
         encoder->maxThreads = max_threads;
+#if AVIF_VERSION >= 1000000
+        encoder->quality = enc_options.quality;
+#else
         encoder->minQuantizer = enc_options.qmin;
         encoder->maxQuantizer = enc_options.qmax;
+#endif
         encoder->codecChoice = enc_options.codec;
         encoder->speed = enc_options.speed;
         encoder->timescale = (uint64_t)1000;

{pillow-avif-plugin-1.3.0 → pillow-avif-plugin-1.4.0}/src/pillow_avif_plugin.egg-info/PKG-INFO

@@ -1,18 +1,12 @@
 Metadata-Version: 2.1
 Name: pillow-avif-plugin
-Version: 1.3.0
+Version: 1.4.0
 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
-Description: # 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.
-        
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Web Environment
@@ -23,14 +17,23 @@ 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 :: 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.3.0 → pillow-avif-plugin-1.4.0}/src/pillow_avif_plugin.egg-info/SOURCES.txt

@@ -1,5 +1,7 @@
+LICENSE
 MANIFEST.in
 README.md
+pyproject.toml
 setup.cfg
 setup.py
 tox.ini

{pillow-avif-plugin-1.3.0 → pillow-avif-plugin-1.4.0}/tox.ini

@@ -1,21 +1,26 @@
 [tox]
-envlist = py{27,36,37,38,39,310,py27,py36,py37}
+envlist = py{27,37,38,39,310,311,312,py37}
 minversion = 1.9
 
 [gh-actions]
+problem_matcher = False
 python =
     2.7: py27
-    3.6: py36
     3.7: py37
     3.8: py38
     3.9: py39
     3.10: py310
-    pypy-2.7: pypy27
-    pypy-3.6: pypy36
+    3.11: py311
+    3.12: py312
     pypy-3.7: pypy37
 
 [testenv]
-passenv = LDFLAGS CFLAGS LD_LIBRARY_PATH TERM CC
+passenv =
+    LDFLAGS
+    CFLAGS
+    LD_LIBRARY_PATH
+    TERM
+    CC
 use_develop = true
 skip_install = true
 setenv =
@@ -24,13 +29,12 @@ setenv =
     GCNO_TARGET_DIR={envdir}/temp
     COVERAGE_FILE={toxworkdir}/coverage/.coverage.{envname}
 commands =
-    {envpython} setup.py clean
-    {envpython} setup.py build_ext --build-lib {envdir}/src --build-temp {envdir} develop
+    {envpython} -m pip install -e . -v
     {envpython} -m pytest -W always {posargs: -vv --cov pillow_avif --cov tests --cov-report term}
-    gcovr -r {toxinidir} --object-directory {envdir} -k
     {envpython} -c "import os; os.path.exists('{toxworkdir}/coverage') or os.makedirs('{toxworkdir}/coverage')"
-    gcovr -r {toxinidir} --object-directory {envdir} -k --xml \
-          -o {toxworkdir}/coverage/gcov_coverage.{envname}.xml
+    - gcovr -r {toxinidir} --object-directory {envdir} -k \
+          --gcov-ignore-errors=no_working_dir_found \
+          -o {toxworkdir}/coverage/.gcov_coverage.{envname}
 deps =
     gcovr
     pytest
@@ -48,7 +52,7 @@ changedir = {toxworkdir}/coverage
 commands =
     coverage combine
     coverage report
-    coverage xml
+    coverage xml -o {toxinidir}/coverage.xml
 
 [testenv:codecov]
 skip_install = true
@@ -57,4 +61,4 @@ depends = coverage-report
 passenv = CODECOV_TOKEN
 changedir = {toxinidir}
 commands =
-    codecov -X gcov --file {toxworkdir}/coverage/*.xml {posargs}
+    codecov -X gcov --file {toxinidir}/coverage.xml {posargs}