python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-07-26 07:59:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix Compliation errors from rebase

Browse Source
This commit is contained in:
wiredfool 2025-07-20 10:18:59 +02:00
parent 84aa4372fd
commit adfb66f1d6
6 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/_imaging.c
View File

@ -297,6 +297,7 @@ ExportArrowArrayPyCapsule(ImagingObject *self) {
static PyObject *
_new_arrow(PyObject *self, PyObject *args) {
char *mode;
ModeID mode_id;
int xsize, ysize;
PyObject *schema_capsule, *array_capsule;
PyObject *ret;
@ -307,9 +308,11 @@ _new_arrow(PyObject *self, PyObject *args) {
return NULL;
}
mode_id = findModeID(mode);
// ImagingBorrowArrow is responsible for retaining the array_capsule
ret = PyImagingNew(
ImagingNewArrow(mode, xsize, ysize, schema_capsule, array_capsule)
ImagingNewArrow(mode_id, xsize, ysize, schema_capsule, array_capsule)
);
if (!ret) {
return ImagingError_ValueError("Invalid Arrow array mode or size mismatch");

2
src/libImaging/BcnEncode.c
View File

@ -253,7 +253,7 @@ int
ImagingBcnEncode(Imaging im, ImagingCodecState state, UINT8 *buf, int bytes) {
int n = state->state;
int has_alpha_channel =
strcmp(im->mode, "RGBA") == 0 || strcmp(im->mode, "LA") == 0;
im->mode == IMAGING_MODE_RGBA || im->mode == IMAGING_MODE_LA;
UINT8 *dst = buf;

3
src/libImaging/Convert.c
View File

@ -1517,9 +1517,6 @@ static struct {
{IMAGING_MODE_RGB, IMAGING_MODE_I_16N, rgb2i16l},
#endif
{IMAGING_MODE_RGB, IMAGING_MODE_F, rgb2f},
{IMAGING_MODE_RGB, IMAGING_MODE_BGR_15, rgb2bgr15},
{IMAGING_MODE_RGB, IMAGING_MODE_BGR_16, rgb2bgr16},
{IMAGING_MODE_RGB, IMAGING_MODE_BGR_24, rgb2bgr24},
{IMAGING_MODE_RGB, IMAGING_MODE_RGBA, rgb2rgba},
{IMAGING_MODE_RGB, IMAGING_MODE_RGBa, rgb2rgba},
{IMAGING_MODE_RGB, IMAGING_MODE_RGBX, rgb2rgba},

2
src/libImaging/Jpeg2KEncode.c
View File

@ -332,7 +332,7 @@ j2k_encode_entry(Imaging im, ImagingCodecState state) {
pack = j2k_pack_rgba;
#if ((OPJ_VERSION_MAJOR == 2 && OPJ_VERSION_MINOR == 5 && OPJ_VERSION_BUILD >= 3) || \
(OPJ_VERSION_MAJOR == 2 && OPJ_VERSION_MINOR > 5) || OPJ_VERSION_MAJOR > 2)
} else if (strcmp(im->mode, "CMYK") == 0) {
} else if (im->mode == IMAGING_MODE_CMYK) {
components = 4;
color_space = OPJ_CLRSPC_CMYK;
pack = j2k_pack_rgba;

4
src/libImaging/Pack.c
View File

@ -651,9 +651,7 @@ static struct {
{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},
{NULL} /* sentinel */
{IMAGING_MODE_I_16B, IMAGING_RAWMODE_I_16N, 16, packI16N_I16B}
};
ImagingShuffler

8
src/libImaging/Unpack.c
View File

@ -1313,7 +1313,7 @@ copy4skip2(UINT8 *_out, const UINT8 *in, int pixels) {
/* Unpack to "I" and "F" images */
#define UNPACK_RAW(NAME, GET, INTYPE, OUTTYPE) \
static void NAME(UINT8 *out, const UINT8 *in, int pixels) { \
static void NAME(UINT8 *out_, const UINT8 *in, int pixels) { \
int i; \
OUTTYPE *out = (OUTTYPE *)out_; \
for (i = 0; i < pixels; i++, in += sizeof(INTYPE)) { \
@ -1322,7 +1322,7 @@ copy4skip2(UINT8 *_out, const UINT8 *in, int pixels) {
}
#define UNPACK(NAME, COPY, INTYPE, OUTTYPE) \
static void NAME(UINT8 *out, const UINT8 *in, int pixels) { \
static void NAME(UINT8 *out_, const UINT8 *in, int pixels) { \
int i; \
OUTTYPE *out = (OUTTYPE *)out_; \
INTYPE tmp_; \
@ -1839,9 +1839,7 @@ static struct {
{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.
{NULL} /* sentinel */
{IMAGING_MODE_I_16, IMAGING_RAWMODE_I_12, 12, unpackI12_I16} // 12 bit Tiffs stored in 16bits.
};
ImagingShuffler