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

[pre-commit.ci] auto fixes from pre-commit.com hooks

Browse Source 
for more information, see https://pre-commit.ci
This commit is contained in:
pre-commit-ci[bot] 2024-07-19 12:29:15 +00:00
parent b6ce6ab137
commit d5053fb50e
9 changed files with 38 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/_imaging.c
View File

@ -730,8 +730,8 @@ _new(PyObject *self, PyObject *args) {
return NULL; return NULL;
} }
return PyImagingNew( return PyImagingNew(ImagingNew(mode, (ImagingNewParams){xsize, ysize, depth, bands})
ImagingNew(mode, (ImagingNewParams){xsize, ysize, depth, bands})); );
} }
static PyObject * static PyObject *
@ -953,7 +953,8 @@ _color_lut_3d(ImagingObject *self, PyObject *args) {
} }
imOut = ImagingNewDirty( imOut = ImagingNewDirty(
mode, (ImagingNewParams){self->image->xsize, self->image->ysize}); mode, (ImagingNewParams){self->image->xsize, self->image->ysize}
);
if (!imOut) { if (!imOut) {
free(prepared_table); free(prepared_table);
return NULL; return NULL;
@ -1765,8 +1766,9 @@ _quantize(ImagingObject *self, PyObject *args) {
if (!self->image->xsize || !self->image->ysize) { if (!self->image->xsize || !self->image->ysize) {
/* no content; return an empty image */ /* no content; return an empty image */
return PyImagingNew(ImagingNew( return PyImagingNew(
"P", (ImagingNewParams){self->image->xsize, self->image->ysize})); ImagingNew("P", (ImagingNewParams){self->image->xsize, self->image->ysize})
);
} }
return PyImagingNew(ImagingQuantize(self->image, colours, method, kmeans)); return PyImagingNew(ImagingQuantize(self->image, colours, method, kmeans));
@ -2159,7 +2161,8 @@ _transpose(ImagingObject *self, PyObject *args) {
case 3: /* rotate 180 */ case 3: /* rotate 180 */
imOut = ImagingNewDirty( imOut = ImagingNewDirty(
imIn->mode, imIn->mode,
(ImagingNewParams){imIn->xsize, imIn->ysize, imIn->depth, imIn->bands}); (ImagingNewParams){imIn->xsize, imIn->ysize, imIn->depth, imIn->bands}
);
break; break;
case 2: /* rotate 90 */ case 2: /* rotate 90 */
case 4: /* rotate 270 */ case 4: /* rotate 270 */
@ -2167,7 +2170,8 @@ _transpose(ImagingObject *self, PyObject *args) {
case 6: /* transverse */ case 6: /* transverse */
imOut = ImagingNewDirty( imOut = ImagingNewDirty(
imIn->mode, imIn->mode,
(ImagingNewParams){imIn->ysize, imIn->xsize, imIn->depth, imIn->bands}); (ImagingNewParams){imIn->ysize, imIn->xsize, imIn->depth, imIn->bands}
);
break; break;
default: default:
PyErr_SetString(PyExc_ValueError, "No such transpose operation"); PyErr_SetString(PyExc_ValueError, "No such transpose operation");
@ -2848,7 +2852,8 @@ _font_getmask(ImagingFontObject *self, PyObject *args) {
} }
im = ImagingNew( im = ImagingNew(
self->bitmap->mode, (ImagingNewParams){textwidth(self, text), self->ysize}); self->bitmap->mode, (ImagingNewParams){textwidth(self, text), self->ysize}
);
if (!im) { if (!im) {
free(text); free(text);
return ImagingError_MemoryError(); return ImagingError_MemoryError();

3
src/libImaging/Crop.c
View File

@ -38,7 +38,8 @@ ImagingCrop(Imaging imIn, int sx0, int sy0, int sx1, int sy1) {
} }
imOut = ImagingNewDirty( imOut = ImagingNewDirty(
imIn->mode, (ImagingNewParams){xsize, ysize, imIn->depth, imIn->bands}); imIn->mode, (ImagingNewParams){xsize, ysize, imIn->depth, imIn->bands}
);
if (!imOut) { if (!imOut) {
return NULL; return NULL;
} }

12
src/libImaging/Geometry.c
View File

@ -108,7 +108,8 @@ ImagingRotate90(Imaging imOut, Imaging imIn) {
memcpy( memcpy(
out + yyy * imIn->pixelsize, out + yyy * imIn->pixelsize,
in + xxx * imIn->pixelsize, in + xxx * imIn->pixelsize,
imIn->pixelsize); imIn->pixelsize
);
} }
} }
} }
@ -158,7 +159,8 @@ ImagingTranspose(Imaging imOut, Imaging imIn) {
memcpy( memcpy(
out + yyy * imIn->pixelsize, out + yyy * imIn->pixelsize,
in + xxx * imIn->pixelsize, in + xxx * imIn->pixelsize,
imIn->pixelsize); imIn->pixelsize
);
} }
} }
} }
@ -210,7 +212,8 @@ ImagingTransverse(Imaging imOut, Imaging imIn) {
memcpy( memcpy(
out + yr * imIn->pixelsize, out + yr * imIn->pixelsize,
in + xxx * imIn->pixelsize, in + xxx * imIn->pixelsize,
imIn->pixelsize); imIn->pixelsize
);
} }
} }
} }
@ -293,7 +296,8 @@ ImagingRotate270(Imaging imOut, Imaging imIn) {
memcpy( memcpy(
out + yr * imIn->pixelsize, out + yr * imIn->pixelsize,
in + xxx * imIn->pixelsize, in + xxx * imIn->pixelsize,
imIn->pixelsize); imIn->pixelsize
);
} }
} }
} }

3
src/libImaging/Imaging.h
View File

@ -705,7 +705,8 @@ struct ImagingCodecStateInstance {
int xsize, ysize, xoff, yoff; int xsize, ysize, xoff, yoff;
ImagingShuffler shuffle; ImagingShuffler shuffle;
void (*mb_shuffle)( void (*mb_shuffle)(
UINT8 *dst, const UINT8 *src, Imaging im, ImagingCodecState state); UINT8 *dst, const UINT8 *src, Imaging im, ImagingCodecState state
);
int bits, bytes; int bits, bytes;
UINT8 *buffer; UINT8 *buffer;
void *context; void *context;

3
src/libImaging/RankFilter.c
View File

@ -85,7 +85,8 @@ MakeRankFunction(UINT8) MakeRankFunction(INT32) MakeRankFunction(FLOAT32)
} }
imOut = ImagingNew( imOut = ImagingNew(
im->mode, (ImagingNewParams){im->xsize - 2 * margin, im->ysize - 2 * margin}); im->mode, (ImagingNewParams){im->xsize - 2 * margin, im->ysize - 2 * margin}
);
if (!imOut) { if (!imOut) {
return NULL; return NULL;
} }

4
src/libImaging/Reduce.c
View File

@ -1462,8 +1462,8 @@ ImagingReduce(Imaging imIn, int xscale, int yscale, int box[4]) {
imOut = ImagingNewDirty( imOut = ImagingNewDirty(
imIn->mode, imIn->mode,
(ImagingNewParams){ (ImagingNewParams
(box[2] + xscale - 1) / xscale, (box[3] + yscale - 1) / yscale} ){(box[2] + xscale - 1) / xscale, (box[3] + yscale - 1) / yscale}
); );
if (!imOut) { if (!imOut) {
return NULL; return NULL;

3
src/libImaging/Resample.c
View File

@ -671,7 +671,8 @@ ImagingResampleInner(
} }
imTemp = ImagingNewDirty( imTemp = ImagingNewDirty(
imIn->mode, (ImagingNewParams){xsize, ybox_last - ybox_first}); imIn->mode, (ImagingNewParams){xsize, ybox_last - ybox_first}
);
if (imTemp) { if (imTemp) {
ResampleHorizontal( ResampleHorizontal(
imTemp, imIn, ybox_first, ksize_horiz, bounds_horiz, kk_horiz imTemp, imIn, ybox_first, ksize_horiz, bounds_horiz, kk_horiz

12
src/libImaging/Storage.c
View File

@ -191,8 +191,8 @@ ImagingNewPrologueSubtype(const char *mode, ImagingNewParams p, int size) {
} else if (strcmp(mode, IMAGING_MODE_MB) == 0) { } else if (strcmp(mode, IMAGING_MODE_MB) == 0) {
if (p.bands <= 0 || p.depth <= 0) { if (p.bands <= 0 || p.depth <= 0) {
return (Imaging)ImagingError_ValueError( return (Imaging)ImagingError_ValueError("multi-band missing bands and depth"
"multi-band missing bands and depth"); );
} }
im->bands = p.bands; im->bands = p.bands;
im->depth = p.depth; im->depth = p.depth;
@ -236,9 +236,7 @@ ImagingNewPrologueSubtype(const char *mode, ImagingNewParams p, int size) {
Imaging Imaging
ImagingNewPrologue(const char *mode, ImagingNewParams p) { ImagingNewPrologue(const char *mode, ImagingNewParams p) {
return ImagingNewPrologueSubtype( return ImagingNewPrologueSubtype(mode, p, sizeof(struct ImagingMemoryInstance));
mode, p, sizeof(struct ImagingMemoryInstance)
);
} }
void void
@ -570,8 +568,8 @@ ImagingNew2Dirty(const char *mode, Imaging imOut, Imaging imIn) {
} else { } else {
/* create new image */ /* create new image */
imOut = ImagingNewDirty( imOut = ImagingNewDirty(
mode, mode, (ImagingNewParams){imIn->xsize, imIn->ysize, imIn->depth, imIn->bands}
(ImagingNewParams){imIn->xsize, imIn->ysize, imIn->depth, imIn->bands}); );
if (!imOut) { if (!imOut) {
return NULL; return NULL;
} }

3
src/map.c
View File

@ -128,7 +128,8 @@ PyImaging_MapBuffer(PyObject *self, PyObject *args) {
im = ImagingNewPrologueSubtype( im = ImagingNewPrologueSubtype(
mode, mode,
(ImagingNewParams){xsize, ysize, depth, bands}, (ImagingNewParams){xsize, ysize, depth, bands},
sizeof(ImagingBufferInstance)); sizeof(ImagingBufferInstance)
);
if (!im) { if (!im) {
PyBuffer_Release(&view); PyBuffer_Release(&view);
return NULL; return NULL;