From cb383ca3716d95ce3f964a300c8997c2b217007d Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 30 Jan 2025 19:27:51 +1100 Subject: [PATCH] Group EXIF info --- src/PIL/AvifImagePlugin.py | 2 +- src/_avif.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/PIL/AvifImagePlugin.py b/src/PIL/AvifImagePlugin.py index dbce440eef9..7b1cc3ce8e7 100644 --- a/src/PIL/AvifImagePlugin.py +++ b/src/PIL/AvifImagePlugin.py @@ -80,7 +80,7 @@ def _open(self) -> None: ) # Get info from decoder - width, height, n_frames, mode, icc, exif, xmp, exif_orientation = ( + width, height, n_frames, mode, icc, exif, exif_orientation, xmp = ( self._decoder.get_info() ) self._size = width, height diff --git a/src/_avif.c b/src/_avif.c index 7a325992ed4..14ec10bf5a8 100644 --- a/src/_avif.c +++ b/src/_avif.c @@ -777,15 +777,15 @@ _decoder_get_info(AvifDecoderObject *self) { } ret = Py_BuildValue( - "IIIsSSSI", + "IIIsSSIS", image->width, image->height, decoder->imageCount, self->mode, NULL == icc ? Py_None : icc, NULL == exif ? Py_None : exif, - NULL == xmp ? Py_None : xmp, - irot_imir_to_exif_orientation(image) + irot_imir_to_exif_orientation(image), + NULL == xmp ? Py_None : xmp ); Py_XDECREF(xmp);