Skip to content

Commit 140d06d

Browse files
radarhereradarhere
committed
Rename IMAGING_TYPE_SPECIAL to IMAGING_TYPE_I16
1 parent 9cd0743 commit 140d06d

11 files changed

Lines changed: 25 additions & 25 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;
@@ -1671,7 +1671,7 @@ _putdata(ImagingObject *self, PyObject *args) {
16711671
}
16721672
double value;
16731673
int bigendian = 0;
1674-
if (image->type == IMAGING_TYPE_SPECIAL) {
1674+
if (image->type == IMAGING_TYPE_I16) {
16751675
// I;16*
16761676
if (
16771677
image->mode == IMAGING_MODE_I_16B
@@ -1687,7 +1687,7 @@ _putdata(ImagingObject *self, PyObject *args) {
16871687
if (scale != 1.0 || offset != 0.0) {
16881688
value = value * scale + offset;
16891689
}
1690-
if (image->type == IMAGING_TYPE_SPECIAL) {
1690+
if (image->type == IMAGING_TYPE_I16) {
16911691
image->image8[y][x * 2 + (bigendian ? 1 : 0)] =
16921692
CLIP8((int)value % 256);
16931693
image->image8[y][x * 2 + (bigendian ? 0 : 1)] =
@@ -2358,7 +2358,7 @@ _getextrema(ImagingObject *self, PyObject *args) {
23582358
return Py_BuildValue("ii", extrema.i[0], extrema.i[1]);
23592359
case IMAGING_TYPE_FLOAT32:
23602360
return Py_BuildValue("dd", extrema.f[0], extrema.f[1]);
2361-
case IMAGING_TYPE_SPECIAL:
2361+
case IMAGING_TYPE_I16:
23622362
if (self->image->mode == IMAGING_MODE_I_16) {
23632363
return Py_BuildValue("HH", extrema.s[0], extrema.s[1]);
23642364
}

‎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 & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ ImagingFilter3x3(Imaging imOut, Imaging im, const float *kernel, float offset) {
156156
}
157157
} else {
158158
int bigendian = 0;
159-
if (im->type == IMAGING_TYPE_SPECIAL) {
159+
if (im->type == IMAGING_TYPE_I16) {
160160
if (
161161
im->mode == IMAGING_MODE_I_16B
162162
#ifdef WORDS_BIGENDIAN
@@ -173,12 +173,12 @@ ImagingFilter3x3(Imaging imOut, Imaging im, const float *kernel, float offset) {
173173
UINT8 *restrict out = (UINT8 *)imOut->image[y];
174174

175175
out[0] = in0[0];
176-
if (im->type == IMAGING_TYPE_SPECIAL) {
176+
if (im->type == IMAGING_TYPE_I16) {
177177
out[1] = in0[1];
178178
}
179179
for (x = 1; x < xsize - 1; x++) {
180180
float ss = offset;
181-
if (im->type == IMAGING_TYPE_SPECIAL) {
181+
if (im->type == IMAGING_TYPE_I16) {
182182
ss += kernel_i16(3, in1, x, &kernel[0], bigendian);
183183
ss += kernel_i16(3, in0, x, &kernel[3], bigendian);
184184
ss += kernel_i16(3, in_1, x, &kernel[6], bigendian);
@@ -192,7 +192,7 @@ ImagingFilter3x3(Imaging imOut, Imaging im, const float *kernel, float offset) {
192192
out[x] = clip8(ss);
193193
}
194194
}
195-
if (im->type == IMAGING_TYPE_SPECIAL) {
195+
if (im->type == IMAGING_TYPE_I16) {
196196
out[x * 2] = in0[x * 2];
197197
out[x * 2 + 1] = in0[x * 2 + 1];
198198
} else {
@@ -316,7 +316,7 @@ ImagingFilter5x5(Imaging imOut, Imaging im, const float *kernel, float offset) {
316316
}
317317
} else {
318318
int bigendian = 0;
319-
if (im->type == IMAGING_TYPE_SPECIAL) {
319+
if (im->type == IMAGING_TYPE_I16) {
320320
if (
321321
im->mode == IMAGING_MODE_I_16B
322322
#ifdef WORDS_BIGENDIAN
@@ -336,13 +336,13 @@ ImagingFilter5x5(Imaging imOut, Imaging im, const float *kernel, float offset) {
336336

337337
out[0] = in0[0];
338338
out[1] = in0[1];
339-
if (im->type == IMAGING_TYPE_SPECIAL) {
339+
if (im->type == IMAGING_TYPE_I16) {
340340
out[2] = in0[2];
341341
out[3] = in0[3];
342342
}
343343
for (x = 2; x < xsize - 2; x++) {
344344
float ss = offset;
345-
if (im->type == IMAGING_TYPE_SPECIAL) {
345+
if (im->type == IMAGING_TYPE_I16) {
346346
ss += kernel_i16(5, in2, x, &kernel[0], bigendian);
347347
ss += kernel_i16(5, in1, x, &kernel[5], bigendian);
348348
ss += kernel_i16(5, in0, x, &kernel[10], bigendian);
@@ -360,7 +360,7 @@ ImagingFilter5x5(Imaging imOut, Imaging im, const float *kernel, float offset) {
360360
out[x] = clip8(ss);
361361
}
362362
}
363-
if (im->type == IMAGING_TYPE_SPECIAL) {
363+
if (im->type == IMAGING_TYPE_I16) {
364364
out[x * 2 + 0] = in0[x * 2 + 0];
365365
out[x * 2 + 1] = in0[x * 2 + 1];
366366
out[x * 2 + 2] = in0[x * 2 + 2];
@@ -471,7 +471,7 @@ ImagingFilter(Imaging im, int xsize, int ysize, const FLOAT32 *kernel, FLOAT32 o
471471
ImagingSectionCookie cookie;
472472

473473
if (im->type == IMAGING_TYPE_FLOAT32 ||
474-
(im->type == IMAGING_TYPE_SPECIAL && im->bands != 1)) {
474+
(im->type == IMAGING_TYPE_I16 && im->bands != 1)) {
475475
return (Imaging)ImagingError_ModeError();
476476
}
477477

‎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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1456,7 +1456,7 @@ ImagingReduce(Imaging imIn, int xscale, int yscale, int box[4]) {
14561456
return (Imaging)ImagingError_ModeError();
14571457
}
14581458

1459-
if (imIn->type == IMAGING_TYPE_SPECIAL) {
1459+
if (imIn->type == IMAGING_TYPE_I16) {
14601460
return (Imaging)ImagingError_ModeError();
14611461
}
14621462

‎src/libImaging/Resample.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -717,7 +717,7 @@ 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) {
720+
if (imIn->type == IMAGING_TYPE_I16) {
721721
if (isModeI16(imIn->mode)) {
722722
ResampleHorizontal = _ImagingResampleHorizontal_16bpc;
723723
ResampleVertical = _ImagingResampleVertical_16bpc;

0 commit comments

Comments
 (0)