From ed164d1bfab8a59d411aadab7d56d1ec116f572a Mon Sep 17 00:00:00 2001 From: Andrew Murray <3112309+radarhere@users.noreply.github.com> Date: Tue, 26 Aug 2025 22:13:45 +1000 Subject: [PATCH] pre-commit fixes --- setup.py | 2 +- src/_imaging.c | 3 ++- src/libImaging/Filter.c | 6 ++++-- src/libImaging/Pack.c | 6 ++++-- src/libImaging/Resample.c | 6 ++++-- src/libImaging/Unpack.c | 14 +++++++++++--- 6 files changed, 26 insertions(+), 11 deletions(-) diff --git a/setup.py b/setup.py index dcc07eaf6..b9f5cfe06 100644 --- a/setup.py +++ b/setup.py @@ -16,7 +16,7 @@ import subprocess import sys import warnings from collections.abc import Iterator -from typing import TYPE_CHECKING, Any +from typing import TYPE_CHECKING from pybind11.setup_helpers import ParallelCompile from setuptools import Extension, setup diff --git a/src/_imaging.c b/src/_imaging.c index 7823745f0..8412124c1 100644 --- a/src/_imaging.c +++ b/src/_imaging.c @@ -1677,7 +1677,8 @@ _putdata(ImagingObject *self, PyObject *args) { int bigendian = 0; if (image->type == IMAGING_TYPE_SPECIAL) { // I;16* - if (image->mode == IMAGING_MODE_I_16B + if ( + image->mode == IMAGING_MODE_I_16B #ifdef WORDS_BIGENDIAN || image->mode == IMAGING_MODE_I_16N #endif diff --git a/src/libImaging/Filter.c b/src/libImaging/Filter.c index 48f210809..cefb8fcdc 100644 --- a/src/libImaging/Filter.c +++ b/src/libImaging/Filter.c @@ -155,7 +155,8 @@ ImagingFilter3x3(Imaging imOut, Imaging im, const float *kernel, float offset) { } else { int bigendian = 0; if (im->type == IMAGING_TYPE_SPECIAL) { - if (im->mode == IMAGING_MODE_I_16B + if ( + im->mode == IMAGING_MODE_I_16B #ifdef WORDS_BIGENDIAN || im->mode == IMAGING_MODE_I_16N #endif @@ -308,7 +309,8 @@ ImagingFilter5x5(Imaging imOut, Imaging im, const float *kernel, float offset) { } else { int bigendian = 0; if (im->type == IMAGING_TYPE_SPECIAL) { - if (im->mode == IMAGING_MODE_I_16B + if ( + im->mode == IMAGING_MODE_I_16B #ifdef WORDS_BIGENDIAN || im->mode == IMAGING_MODE_I_16N #endif diff --git a/src/libImaging/Pack.c b/src/libImaging/Pack.c index 0a97c4872..4afeb15b7 100644 --- a/src/libImaging/Pack.c +++ b/src/libImaging/Pack.c @@ -648,8 +648,10 @@ static struct { {IMAGING_MODE_I_16B, IMAGING_RAWMODE_I_16B, 16, copy2}, {IMAGING_MODE_I_16L, IMAGING_RAWMODE_I_16L, 16, copy2}, {IMAGING_MODE_I_16N, IMAGING_RAWMODE_I_16N, 16, copy2}, - {IMAGING_MODE_I_16, IMAGING_RAWMODE_I_16N, 16, packI16N_I16 - }, // LibTiff native->image endian. + {IMAGING_MODE_I_16, + IMAGING_RAWMODE_I_16N, + 16, + packI16N_I16}, // LibTiff native->image endian. {IMAGING_MODE_I_16L, IMAGING_RAWMODE_I_16N, 16, packI16N_I16}, {IMAGING_MODE_I_16B, IMAGING_RAWMODE_I_16N, 16, packI16N_I16B} }; diff --git a/src/libImaging/Resample.c b/src/libImaging/Resample.c index 3ab43a895..cbd18d0c1 100644 --- a/src/libImaging/Resample.c +++ b/src/libImaging/Resample.c @@ -470,7 +470,8 @@ ImagingResampleHorizontal_16bpc( double *k; int bigendian = 0; - if (imIn->mode == IMAGING_MODE_I_16N + if ( + imIn->mode == IMAGING_MODE_I_16N #ifdef WORDS_BIGENDIAN || imIn->mode == IMAGING_MODE_I_16B #endif @@ -509,7 +510,8 @@ ImagingResampleVertical_16bpc( double *k; int bigendian = 0; - if (imIn->mode == IMAGING_MODE_I_16N + if ( + imIn->mode == IMAGING_MODE_I_16N #ifdef WORDS_BIGENDIAN || imIn->mode == IMAGING_MODE_I_16B #endif diff --git a/src/libImaging/Unpack.c b/src/libImaging/Unpack.c index 075ec5b95..27ac7c467 100644 --- a/src/libImaging/Unpack.c +++ b/src/libImaging/Unpack.c @@ -1833,13 +1833,21 @@ static struct { {IMAGING_MODE_I_16N, IMAGING_RAWMODE_I_16N, 16, copy2}, {IMAGING_MODE_I_16, IMAGING_RAWMODE_I_16B, 16, unpackI16B_I16}, - {IMAGING_MODE_I_16, IMAGING_RAWMODE_I_16N, 16, unpackI16N_I16}, // LibTiff native->image endian. - {IMAGING_MODE_I_16L, IMAGING_RAWMODE_I_16N, 16, unpackI16N_I16}, // LibTiff native->image endian. + {IMAGING_MODE_I_16, + IMAGING_RAWMODE_I_16N, + 16, + unpackI16N_I16}, // LibTiff native->image endian. + { + IMAGING_MODE_I_16L, IMAGING_RAWMODE_I_16N, 16, unpackI16N_I16 + }, // LibTiff native->image endian. {IMAGING_MODE_I_16B, IMAGING_RAWMODE_I_16N, 16, unpackI16N_I16B}, {IMAGING_MODE_I_16, IMAGING_RAWMODE_I_16R, 16, unpackI16R_I16}, - {IMAGING_MODE_I_16, IMAGING_RAWMODE_I_12, 12, unpackI12_I16} // 12 bit Tiffs stored in 16bits. + {IMAGING_MODE_I_16, + IMAGING_RAWMODE_I_12, + 12, + unpackI12_I16} // 12 bit Tiffs stored in 16bits. }; ImagingShuffler