Skip to content

Commit 3ba2ea7

Browse files
Yay295Yay295
committed
linter changes
1 parent f7b5726 commit 3ba2ea7

File tree

15 files changed

+119
-105
lines changed

15 files changed

+119
-105
lines changed

‎src/Tk/tkImaging.c‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,10 +124,8 @@ PyImagingPhotoPut(
124124
if (im->mode == IMAGING_MODE_1 || im->mode == IMAGING_MODE_L) {
125125
block.pixelSize = 1;
126126
block.offset[0] = block.offset[1] = block.offset[2] = block.offset[3] = 0;
127-
} else if (
128-
im->mode == IMAGING_MODE_RGB || im->mode == IMAGING_MODE_RGBA ||
129-
im->mode == IMAGING_MODE_RGBX || im->mode == IMAGING_MODE_RGBa
130-
) {
127+
} else if (im->mode == IMAGING_MODE_RGB || im->mode == IMAGING_MODE_RGBA ||
128+
im->mode == IMAGING_MODE_RGBX || im->mode == IMAGING_MODE_RGBa) {
131129
block.pixelSize = 4;
132130
block.offset[0] = 0;
133131
block.offset[1] = 1;

‎src/_imaging.c‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1720,7 +1720,9 @@ _quantize(ImagingObject *self, PyObject *args) {
17201720

17211721
if (!self->image->xsize || !self->image->ysize) {
17221722
/* no content; return an empty image */
1723-
return PyImagingNew(ImagingNew(IMAGING_MODE_P, self->image->xsize, self->image->ysize));
1723+
return PyImagingNew(
1724+
ImagingNew(IMAGING_MODE_P, self->image->xsize, self->image->ysize)
1725+
);
17241726
}
17251727

17261728
return PyImagingNew(ImagingQuantize(self->image, colours, method, kmeans));
@@ -2004,7 +2006,8 @@ _reduce(ImagingObject *self, PyObject *args) {
20042006

20052007
static int
20062008
isRGB(const ModeID mode) {
2007-
return mode == IMAGING_MODE_RGB || mode == IMAGING_MODE_RGBA || mode == IMAGING_MODE_RGBX;
2009+
return mode == IMAGING_MODE_RGB || mode == IMAGING_MODE_RGBA ||
2010+
mode == IMAGING_MODE_RGBX;
20082011
}
20092012

20102013
static PyObject *

‎src/decode.c‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,9 @@ static PyTypeObject ImagingDecoderType = {
293293
/* -------------------------------------------------------------------- */
294294

295295
int
296-
get_unpacker(ImagingDecoderObject *decoder, const ModeID mode, const RawModeID rawmode) {
296+
get_unpacker(
297+
ImagingDecoderObject *decoder, const ModeID mode, const RawModeID rawmode
298+
) {
297299
int bits;
298300
ImagingShuffler unpack;
299301

@@ -324,7 +326,9 @@ PyImaging_BitDecoderNew(PyObject *self, PyObject *args) {
324326
int fill = 0;
325327
int sign = 0;
326328
int ystep = 1;
327-
if (!PyArg_ParseTuple(args, "s|iiiii", &mode_name, &bits, &pad, &fill, &sign, &ystep)) {
329+
if (!PyArg_ParseTuple(
330+
args, "s|iiiii", &mode_name, &bits, &pad, &fill, &sign, &ystep
331+
)) {
328332
return NULL;
329333
}
330334

@@ -435,7 +439,9 @@ PyImaging_GifDecoderNew(PyObject *self, PyObject *args) {
435439
int bits = 8;
436440
int interlace = 0;
437441
int transparency = -1;
438-
if (!PyArg_ParseTuple(args, "s|iii", &mode_name, &bits, &interlace, &transparency)) {
442+
if (!PyArg_ParseTuple(
443+
args, "s|iii", &mode_name, &bits, &interlace, &transparency
444+
)) {
439445
return NULL;
440446
}
441447

@@ -508,7 +514,9 @@ PyImaging_LibTiffDecoderNew(PyObject *self, PyObject *args) {
508514
int fp;
509515
uint32_t ifdoffset;
510516

511-
if (!PyArg_ParseTuple(args, "sssiI", &mode_name, &rawmode_name, &compname, &fp, &ifdoffset)) {
517+
if (!PyArg_ParseTuple(
518+
args, "sssiI", &mode_name, &rawmode_name, &compname, &fp, &ifdoffset
519+
)) {
512520
return NULL;
513521
}
514522

@@ -850,12 +858,14 @@ PyImaging_JpegDecoderNew(PyObject *self, PyObject *args) {
850858
ImagingDecoderObject *decoder;
851859

852860
char *mode_name;
853-
char *rawmode_name; /* what we want from the decoder */
861+
char *rawmode_name; /* what we want from the decoder */
854862
char *jpegmode_name; /* what's in the file */
855863
int scale = 1;
856864
int draft = 0;
857865

858-
if (!PyArg_ParseTuple(args, "ssz|ii", &mode_name, &rawmode_name, &jpegmode_name, &scale, &draft)) {
866+
if (!PyArg_ParseTuple(
867+
args, "ssz|ii", &mode_name, &rawmode_name, &jpegmode_name, &scale, &draft
868+
)) {
859869
return NULL;
860870
}
861871

‎src/encode.c‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,9 @@ PyImaging_GifEncoderNew(PyObject *self, PyObject *args) {
412412
char *rawmode_name;
413413
Py_ssize_t bits = 8;
414414
Py_ssize_t interlace = 0;
415-
if (!PyArg_ParseTuple(args, "ss|nn", &mode_name, &rawmode_name, &bits, &interlace)) {
415+
if (!PyArg_ParseTuple(
416+
args, "ss|nn", &mode_name, &rawmode_name, &bits, &interlace
417+
)) {
416418
return NULL;
417419
}
418420

‎src/libImaging/Convert.c‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1724,25 +1724,22 @@ ImagingConvertTransparent(Imaging imIn, const ModeID mode, int r, int g, int b)
17241724
return (Imaging)ImagingError_ModeError();
17251725
}
17261726

1727-
if (imIn->mode == IMAGING_MODE_RGB && (mode == IMAGING_MODE_RGBA || mode == IMAGING_MODE_RGBa)) {
1727+
if (imIn->mode == IMAGING_MODE_RGB &&
1728+
(mode == IMAGING_MODE_RGBA || mode == IMAGING_MODE_RGBa)) {
17281729
convert = rgb2rgba;
17291730
if (mode == IMAGING_MODE_RGBa) {
17301731
premultiplied = 1;
17311732
}
1732-
} else if (imIn->mode == IMAGING_MODE_RGB && (mode == IMAGING_MODE_LA || mode == IMAGING_MODE_La)) {
1733+
} else if (imIn->mode == IMAGING_MODE_RGB &&
1734+
(mode == IMAGING_MODE_LA || mode == IMAGING_MODE_La)) {
17331735
convert = rgb2la;
17341736
source_transparency = 1;
17351737
if (mode == IMAGING_MODE_La) {
17361738
premultiplied = 1;
17371739
}
1738-
} else if ((imIn->mode == IMAGING_MODE_1 ||
1739-
imIn->mode == IMAGING_MODE_I ||
1740-
imIn->mode == IMAGING_MODE_I_16 ||
1741-
imIn->mode == IMAGING_MODE_L
1742-
) && (
1743-
mode == IMAGING_MODE_RGBA ||
1744-
mode == IMAGING_MODE_LA
1745-
)) {
1740+
} else if ((imIn->mode == IMAGING_MODE_1 || imIn->mode == IMAGING_MODE_I ||
1741+
imIn->mode == IMAGING_MODE_I_16 || imIn->mode == IMAGING_MODE_L) &&
1742+
(mode == IMAGING_MODE_RGBA || mode == IMAGING_MODE_LA)) {
17461743
if (imIn->mode == IMAGING_MODE_1) {
17471744
convert = bit2rgb;
17481745
} else if (imIn->mode == IMAGING_MODE_I) {

‎src/libImaging/Fill.c‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,8 @@ ImagingFillLinearGradient(const ModeID mode) {
7272
Imaging im;
7373
int y;
7474

75-
if (mode != IMAGING_MODE_1 && mode != IMAGING_MODE_F &&
76-
mode != IMAGING_MODE_I && mode != IMAGING_MODE_L &&
77-
mode != IMAGING_MODE_P
78-
) {
75+
if (mode != IMAGING_MODE_1 && mode != IMAGING_MODE_F && mode != IMAGING_MODE_I &&
76+
mode != IMAGING_MODE_L && mode != IMAGING_MODE_P) {
7977
return (Imaging)ImagingError_ModeError();
8078
}
8179

@@ -110,10 +108,8 @@ ImagingFillRadialGradient(const ModeID mode) {
110108
int x, y;
111109
int d;
112110

113-
if (mode != IMAGING_MODE_1 && mode != IMAGING_MODE_F &&
114-
mode != IMAGING_MODE_I && mode != IMAGING_MODE_L &&
115-
mode != IMAGING_MODE_P
116-
) {
111+
if (mode != IMAGING_MODE_1 && mode != IMAGING_MODE_F && mode != IMAGING_MODE_I &&
112+
mode != IMAGING_MODE_L && mode != IMAGING_MODE_P) {
117113
return (Imaging)ImagingError_ModeError();
118114
}
119115

‎src/libImaging/GetBBox.c‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,10 @@ ImagingGetBBox(Imaging im, int bbox[4], int alpha_only) {
8989
INT32 mask = 0xffffffff;
9090
if (im->bands == 3) {
9191
((UINT8 *)&mask)[3] = 0;
92-
} else if (alpha_only && (
93-
im->mode == IMAGING_MODE_RGBa || im->mode == IMAGING_MODE_RGBA ||
94-
im->mode == IMAGING_MODE_La || im->mode == IMAGING_MODE_LA ||
95-
im->mode == IMAGING_MODE_PA
96-
)) {
92+
} else if (alpha_only &&
93+
(im->mode == IMAGING_MODE_RGBa || im->mode == IMAGING_MODE_RGBA ||
94+
im->mode == IMAGING_MODE_La || im->mode == IMAGING_MODE_LA ||
95+
im->mode == IMAGING_MODE_PA)) {
9796
#ifdef WORDS_BIGENDIAN
9897
mask = 0x000000ff;
9998
#else

‎src/libImaging/Matrix.c‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,8 @@ ImagingConvertMatrix(Imaging im, const ModeID mode, float m[]) {
4646
}
4747
}
4848
ImagingSectionLeave(&cookie);
49-
} else if (
50-
mode == IMAGING_MODE_HSV ||
51-
mode == IMAGING_MODE_LAB ||
52-
mode == IMAGING_MODE_RGB
53-
) {
49+
} else if (mode == IMAGING_MODE_HSV || mode == IMAGING_MODE_LAB ||
50+
mode == IMAGING_MODE_RGB) {
5451
imOut = ImagingNewDirty(mode, im->xsize, im->ysize);
5552
if (!imOut) {
5653
return NULL;

‎src/libImaging/Mode.c‎

Lines changed: 26 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -9,36 +9,25 @@
99
const ModeData MODES[] = {
1010
[IMAGING_MODE_UNKNOWN] = {""},
1111

12-
[IMAGING_MODE_1] = {"1"},
13-
[IMAGING_MODE_CMYK] = {"CMYK"},
14-
[IMAGING_MODE_F] = {"F"},
15-
[IMAGING_MODE_HSV] = {"HSV"},
16-
[IMAGING_MODE_I] = {"I"},
17-
[IMAGING_MODE_L] = {"L"},
18-
[IMAGING_MODE_LA] = {"LA"},
19-
[IMAGING_MODE_LAB] = {"LAB"},
20-
[IMAGING_MODE_La] = {"La"},
21-
[IMAGING_MODE_P] = {"P"},
22-
[IMAGING_MODE_PA] = {"PA"},
23-
[IMAGING_MODE_RGB] = {"RGB"},
24-
[IMAGING_MODE_RGBA] = {"RGBA"},
25-
[IMAGING_MODE_RGBX] = {"RGBX"},
26-
[IMAGING_MODE_RGBa] = {"RGBa"},
27-
[IMAGING_MODE_YCbCr] = {"YCbCr"},
12+
[IMAGING_MODE_1] = {"1"}, [IMAGING_MODE_CMYK] = {"CMYK"},
13+
[IMAGING_MODE_F] = {"F"}, [IMAGING_MODE_HSV] = {"HSV"},
14+
[IMAGING_MODE_I] = {"I"}, [IMAGING_MODE_L] = {"L"},
15+
[IMAGING_MODE_LA] = {"LA"}, [IMAGING_MODE_LAB] = {"LAB"},
16+
[IMAGING_MODE_La] = {"La"}, [IMAGING_MODE_P] = {"P"},
17+
[IMAGING_MODE_PA] = {"PA"}, [IMAGING_MODE_RGB] = {"RGB"},
18+
[IMAGING_MODE_RGBA] = {"RGBA"}, [IMAGING_MODE_RGBX] = {"RGBX"},
19+
[IMAGING_MODE_RGBa] = {"RGBa"}, [IMAGING_MODE_YCbCr] = {"YCbCr"},
2820

29-
[IMAGING_MODE_BGR_15] = {"BGR;15"},
30-
[IMAGING_MODE_BGR_16] = {"BGR;16"},
21+
[IMAGING_MODE_BGR_15] = {"BGR;15"}, [IMAGING_MODE_BGR_16] = {"BGR;16"},
3122
[IMAGING_MODE_BGR_24] = {"BGR;24"},
3223

33-
[IMAGING_MODE_I_16] = {"I;16"},
34-
[IMAGING_MODE_I_16L] = {"I;16L"},
35-
[IMAGING_MODE_I_16B] = {"I;16B"},
36-
[IMAGING_MODE_I_16N] = {"I;16N"},
37-
[IMAGING_MODE_I_32L] = {"I;32L"},
38-
[IMAGING_MODE_I_32B] = {"I;32B"},
24+
[IMAGING_MODE_I_16] = {"I;16"}, [IMAGING_MODE_I_16L] = {"I;16L"},
25+
[IMAGING_MODE_I_16B] = {"I;16B"}, [IMAGING_MODE_I_16N] = {"I;16N"},
26+
[IMAGING_MODE_I_32L] = {"I;32L"}, [IMAGING_MODE_I_32B] = {"I;32B"},
3927
};
4028

41-
const ModeID findModeID(const char * const name) {
29+
const ModeID
30+
findModeID(const char *const name) {
4231
if (name == NULL) {
4332
return IMAGING_MODE_UNKNOWN;
4433
}
@@ -48,21 +37,21 @@ const ModeID findModeID(const char * const name) {
4837
fprintf(stderr, "Mode ID %zu is not defined.\n", (size_t)i);
4938
} else
5039
#endif
51-
if (strcmp(MODES[i].name, name) == 0) {
40+
if (strcmp(MODES[i].name, name) == 0) {
5241
return (ModeID)i;
5342
}
5443
}
5544
return IMAGING_MODE_UNKNOWN;
5645
}
5746

58-
const ModeData * const getModeData(const ModeID id) {
47+
const ModeData *const
48+
getModeData(const ModeID id) {
5949
if (id < 0 || id > sizeof(MODES) / sizeof(*MODES)) {
6050
return &MODES[IMAGING_MODE_UNKNOWN];
6151
}
6252
return &MODES[id];
6353
}
6454

65-
6655
const RawModeData RAWMODES[] = {
6756
[IMAGING_RAWMODE_UNKNOWN] = {""},
6857

@@ -242,7 +231,8 @@ const RawModeData RAWMODES[] = {
242231
[IMAGING_RAWMODE_aRGB] = {"aRGB"},
243232
};
244233

245-
const RawModeID findRawModeID(const char * const name) {
234+
const RawModeID
235+
findRawModeID(const char *const name) {
246236
if (name == NULL) {
247237
return IMAGING_RAWMODE_UNKNOWN;
248238
}
@@ -252,24 +242,23 @@ const RawModeID findRawModeID(const char * const name) {
252242
fprintf(stderr, "Rawmode ID %zu is not defined.\n", (size_t)i);
253243
} else
254244
#endif
255-
if (strcmp(RAWMODES[i].name, name) == 0) {
245+
if (strcmp(RAWMODES[i].name, name) == 0) {
256246
return (RawModeID)i;
257247
}
258248
}
259249
return IMAGING_RAWMODE_UNKNOWN;
260250
}
261251

262-
const RawModeData * const getRawModeData(const RawModeID id) {
252+
const RawModeData *const
253+
getRawModeData(const RawModeID id) {
263254
if (id < 0 || id > sizeof(RAWMODES) / sizeof(*RAWMODES)) {
264255
return &RAWMODES[IMAGING_RAWMODE_UNKNOWN];
265256
}
266257
return &RAWMODES[id];
267258
}
268259

269-
270-
int isModeI16(const ModeID mode) {
271-
return mode == IMAGING_MODE_I_16
272-
|| mode == IMAGING_MODE_I_16L
273-
|| mode == IMAGING_MODE_I_16B
274-
|| mode == IMAGING_MODE_I_16N;
260+
int
261+
isModeI16(const ModeID mode) {
262+
return mode == IMAGING_MODE_I_16 || mode == IMAGING_MODE_I_16L ||
263+
mode == IMAGING_MODE_I_16B || mode == IMAGING_MODE_I_16N;
275264
}

‎src/libImaging/Mode.h‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#ifndef __MODE_H__
22
#define __MODE_H__
33

4-
54
typedef enum {
65
IMAGING_MODE_UNKNOWN,
76

@@ -35,12 +34,13 @@ typedef enum {
3534
} ModeID;
3635

3736
typedef struct {
38-
const char * const name;
37+
const char *const name;
3938
} ModeData;
4039

41-
const ModeID findModeID(const char * const name);
42-
const ModeData * const getModeData(const ModeID id);
43-
40+
const ModeID
41+
findModeID(const char *const name);
42+
const ModeData *const
43+
getModeData(const ModeID id);
4444

4545
typedef enum {
4646
IMAGING_RAWMODE_UNKNOWN,
@@ -226,13 +226,15 @@ typedef enum {
226226
} RawModeID;
227227

228228
typedef struct {
229-
const char * const name;
229+
const char *const name;
230230
} RawModeData;
231231

232-
const RawModeID findRawModeID(const char * const name);
233-
const RawModeData * const getRawModeData(const RawModeID id);
234-
232+
const RawModeID
233+
findRawModeID(const char *const name);
234+
const RawModeData *const
235+
getRawModeData(const RawModeID id);
235236

236-
int isModeI16(const ModeID mode);
237+
int
238+
isModeI16(const ModeID mode);
237239

238-
#endif // __MODE_H__
240+
#endif // __MODE_H__

0 commit comments

Comments
 (0)