Skip to content

Commit 12f88ed

Browse files
hugovkhugovk
authored
Rename IMAGING_TYPE_SPECIAL to IMAGING_TYPE_I16 (#9794)
2 parents 18d5b7d + cbe50ed commit 12f88ed

11 files changed

Lines changed: 28 additions & 36 deletions

File tree

‎src/_imaging.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,7 @@ getpixel(Imaging im, ImagingAccess access, int x, int y) {
565565
return PyLong_FromLong(pixel.i);
566566
case IMAGING_TYPE_FLOAT32:
567567
return PyFloat_FromDouble(pixel.f);
568-
case IMAGING_TYPE_SPECIAL:
568+
case IMAGING_TYPE_I16:
569569
return PyLong_FromLong(pixel.h);
570570
}
571571

@@ -594,7 +594,7 @@ getink(PyObject *color, Imaging im, char *ink) {
594594
color = PyTuple_GetItem(color, 0);
595595
}
596596
if (im->type == IMAGING_TYPE_UINT8 || im->type == IMAGING_TYPE_INT32 ||
597-
im->type == IMAGING_TYPE_SPECIAL) {
597+
im->type == IMAGING_TYPE_I16) {
598598
if (PyLong_Check(color)) {
599599
r = PyLong_AsLongLong(color);
600600
if (r == -1 && PyErr_Occurred()) {
@@ -682,7 +682,7 @@ getink(PyObject *color, Imaging im, char *ink) {
682682
ftmp = f;
683683
memcpy(ink, &ftmp, sizeof(ftmp));
684684
return ink;
685-
case IMAGING_TYPE_SPECIAL:
685+
case IMAGING_TYPE_I16:
686686
ink[0] = (UINT8)r;
687687
ink[1] = (UINT8)(r >> 8);
688688
ink[2] = ink[3] = 0;
@@ -1674,7 +1674,7 @@ _putdata(ImagingObject *self, PyObject *args) {
16741674
}
16751675
double value;
16761676
int bigendian = 0;
1677-
if (image->type == IMAGING_TYPE_SPECIAL) {
1677+
if (image->type == IMAGING_TYPE_I16) {
16781678
// I;16*
16791679
if (
16801680
image->mode == IMAGING_MODE_I_16B
@@ -1690,7 +1690,7 @@ _putdata(ImagingObject *self, PyObject *args) {
16901690
if (scale != 1.0 || offset != 0.0) {
16911691
value = value * scale + offset;
16921692
}
1693-
if (image->type == IMAGING_TYPE_SPECIAL) {
1693+
if (image->type == IMAGING_TYPE_I16) {
16941694
image->image8[y][x * 2 + (bigendian ? 1 : 0)] =
16951695
CLIP8((int)value % 256);
16961696
image->image8[y][x * 2 + (bigendian ? 0 : 1)] =
@@ -2331,7 +2331,7 @@ _getextrema(ImagingObject *self, PyObject *args) {
23312331
return Py_BuildValue("ii", extrema.i[0], extrema.i[1]);
23322332
case IMAGING_TYPE_FLOAT32:
23332333
return Py_BuildValue("dd", extrema.f[0], extrema.f[1]);
2334-
case IMAGING_TYPE_SPECIAL:
2334+
case IMAGING_TYPE_I16:
23352335
if (self->image->mode == IMAGING_MODE_I_16) {
23362336
return Py_BuildValue("HH", extrema.s[0], extrema.s[1]);
23372337
}

‎src/libImaging/Fill.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ ImagingFill(Imaging im, const void *colour) {
3232
int xsize = im->xsize;
3333
int ysize = im->ysize;
3434

35-
if (im->type == IMAGING_TYPE_SPECIAL) {
35+
if (im->type == IMAGING_TYPE_I16) {
3636
/* use generic API */
3737
ImagingAccess access = ImagingAccessNew(im);
3838
if (access) {

‎src/libImaging/Filter.c‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ ImagingFilter3x3(Imaging imOut, Imaging im, const float *kernel, float offset) {
163163
}
164164
} else {
165165
int bigendian = 0;
166-
if (im->type == IMAGING_TYPE_SPECIAL) {
166+
if (im->type == IMAGING_TYPE_I16) {
167167
if (
168168
im->mode == IMAGING_MODE_I_16B
169169
#ifdef WORDS_BIGENDIAN
@@ -180,12 +180,12 @@ ImagingFilter3x3(Imaging imOut, Imaging im, const float *kernel, float offset) {
180180
UINT8 *restrict out = (UINT8 *)imOut->image[y];
181181

182182
out[0] = in0[0];
183-
if (im->type == IMAGING_TYPE_SPECIAL) {
183+
if (im->type == IMAGING_TYPE_I16) {
184184
out[1] = in0[1];
185185
}
186186
for (x = 1; x < xsize - 1; x++) {
187187
float ss = offset;
188-
if (im->type == IMAGING_TYPE_SPECIAL) {
188+
if (im->type == IMAGING_TYPE_I16) {
189189
ss += kernel_i16(3, in1, x, &kernel[0], bigendian);
190190
ss += kernel_i16(3, in0, x, &kernel[3], bigendian);
191191
ss += kernel_i16(3, in_1, x, &kernel[6], bigendian);
@@ -200,7 +200,7 @@ ImagingFilter3x3(Imaging imOut, Imaging im, const float *kernel, float offset) {
200200
out[x] = clip8(ss);
201201
}
202202
}
203-
if (im->type == IMAGING_TYPE_SPECIAL) {
203+
if (im->type == IMAGING_TYPE_I16) {
204204
out[x * 2] = in0[x * 2];
205205
out[x * 2 + 1] = in0[x * 2 + 1];
206206
} else {
@@ -324,7 +324,7 @@ ImagingFilter5x5(Imaging imOut, Imaging im, const float *kernel, float offset) {
324324
}
325325
} else {
326326
int bigendian = 0;
327-
if (im->type == IMAGING_TYPE_SPECIAL) {
327+
if (im->type == IMAGING_TYPE_I16) {
328328
if (
329329
im->mode == IMAGING_MODE_I_16B
330330
#ifdef WORDS_BIGENDIAN
@@ -344,13 +344,13 @@ ImagingFilter5x5(Imaging imOut, Imaging im, const float *kernel, float offset) {
344344

345345
out[0] = in0[0];
346346
out[1] = in0[1];
347-
if (im->type == IMAGING_TYPE_SPECIAL) {
347+
if (im->type == IMAGING_TYPE_I16) {
348348
out[2] = in0[2];
349349
out[3] = in0[3];
350350
}
351351
for (x = 2; x < xsize - 2; x++) {
352352
float ss = offset;
353-
if (im->type == IMAGING_TYPE_SPECIAL) {
353+
if (im->type == IMAGING_TYPE_I16) {
354354
ss += kernel_i16(5, in2, x, &kernel[0], bigendian);
355355
ss += kernel_i16(5, in1, x, &kernel[5], bigendian);
356356
ss += kernel_i16(5, in0, x, &kernel[10], bigendian);
@@ -369,7 +369,7 @@ ImagingFilter5x5(Imaging imOut, Imaging im, const float *kernel, float offset) {
369369
out[x] = clip8(ss);
370370
}
371371
}
372-
if (im->type == IMAGING_TYPE_SPECIAL) {
372+
if (im->type == IMAGING_TYPE_I16) {
373373
out[x * 2 + 0] = in0[x * 2 + 0];
374374
out[x * 2 + 1] = in0[x * 2 + 1];
375375
out[x * 2 + 2] = in0[x * 2 + 2];
@@ -479,8 +479,7 @@ ImagingFilter(Imaging im, int xsize, int ysize, const FLOAT32 *kernel, FLOAT32 o
479479
Imaging imOut;
480480
ImagingSectionCookie cookie;
481481

482-
if (im->type == IMAGING_TYPE_FLOAT32 ||
483-
(im->type == IMAGING_TYPE_SPECIAL && im->bands != 1)) {
482+
if (im->type == IMAGING_TYPE_FLOAT32) {
484483
return (Imaging)ImagingError_ModeError();
485484
}
486485

‎src/libImaging/Geometry.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -713,7 +713,7 @@ getfilter(Imaging im, int filterid) {
713713
switch (im->type) {
714714
case IMAGING_TYPE_UINT8:
715715
return nearest_filter8;
716-
case IMAGING_TYPE_SPECIAL:
716+
case IMAGING_TYPE_I16:
717717
return nearest_filter16;
718718
}
719719
} else {
@@ -1032,7 +1032,7 @@ ImagingTransformAffine(
10321032
return (Imaging)ImagingError_ModeError();
10331033
}
10341034

1035-
if (filterid || imIn->type == IMAGING_TYPE_SPECIAL) {
1035+
if (filterid || imIn->type == IMAGING_TYPE_I16) {
10361036
return ImagingGenericTransform(
10371037
imOut, imIn, x0, y0, x1, y1, affine_transform, a, filterid, fill
10381038
);

‎src/libImaging/GetBBox.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ ImagingGetExtrema(Imaging im, void *extrema) {
209209
memcpy(extrema, &fmin, sizeof(fmin));
210210
memcpy(((char *)extrema) + sizeof(fmin), &fmax, sizeof(fmax));
211211
break;
212-
case IMAGING_TYPE_SPECIAL:
212+
case IMAGING_TYPE_I16:
213213
if (im->mode == IMAGING_MODE_I_16) {
214214
UINT16 v;
215215
UINT8 *pixel = *im->image8;

‎src/libImaging/Imaging.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ typedef struct ImagingPaletteInstance *ImagingPalette;
7070
#define IMAGING_TYPE_UINT8 0
7171
#define IMAGING_TYPE_INT32 1
7272
#define IMAGING_TYPE_FLOAT32 2
73-
#define IMAGING_TYPE_SPECIAL 3 /* check mode for details */
73+
#define IMAGING_TYPE_I16 3
7474

7575
typedef struct {
7676
char *ptr;

‎src/libImaging/Point.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ ImagingPointTransform(Imaging imIn, double scale, double offset) {
244244
}
245245
ImagingSectionLeave(&cookie);
246246
break;
247-
case IMAGING_TYPE_SPECIAL:
247+
case IMAGING_TYPE_I16:
248248
if (imIn->mode == IMAGING_MODE_I_16) {
249249
ImagingSectionEnter(&cookie);
250250
for (y = 0; y < imIn->ysize; y++) {

‎src/libImaging/RankFilter.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ MakeRankFunction(UINT8) MakeRankFunction(INT32) MakeRankFunction(FLOAT32)
6464
int x, y;
6565
int i, margin, size2;
6666

67-
if (!im || im->bands != 1 || im->type == IMAGING_TYPE_SPECIAL) {
67+
if (!im || im->bands != 1 || im->type == IMAGING_TYPE_I16) {
6868
return (Imaging)ImagingError_ModeError();
6969
}
7070

‎src/libImaging/Reduce.c‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1452,11 +1452,8 @@ ImagingReduce(Imaging imIn, int xscale, int yscale, int box[4]) {
14521452
ImagingSectionCookie cookie;
14531453
Imaging imOut = NULL;
14541454

1455-
if (imIn->mode == IMAGING_MODE_P || imIn->mode == IMAGING_MODE_1) {
1456-
return (Imaging)ImagingError_ModeError();
1457-
}
1458-
1459-
if (imIn->type == IMAGING_TYPE_SPECIAL) {
1455+
if (imIn->mode == IMAGING_MODE_P || imIn->mode == IMAGING_MODE_1 ||
1456+
imIn->type == IMAGING_TYPE_I16) {
14601457
return (Imaging)ImagingError_ModeError();
14611458
}
14621459

‎src/libImaging/Resample.c‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -717,13 +717,9 @@ ImagingResample(Imaging imIn, int xsize, int ysize, int filter, float box[4]) {
717717
return (Imaging)ImagingError_ModeError();
718718
}
719719

720-
if (imIn->type == IMAGING_TYPE_SPECIAL) {
721-
if (isModeI16(imIn->mode)) {
722-
ResampleHorizontal = _ImagingResampleHorizontal_16bpc;
723-
ResampleVertical = _ImagingResampleVertical_16bpc;
724-
} else {
725-
return (Imaging)ImagingError_ModeError();
726-
}
720+
if (imIn->type == IMAGING_TYPE_I16) {
721+
ResampleHorizontal = _ImagingResampleHorizontal_16bpc;
722+
ResampleVertical = _ImagingResampleVertical_16bpc;
727723
} else if (imIn->image8) {
728724
ResampleHorizontal = _ImagingResampleHorizontal_8bpc;
729725
ResampleVertical = _ImagingResampleVertical_8bpc;

0 commit comments

Comments
 (0)