From 57c7a51b51b2fa967921182d2640f1d444ba8d9d Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 21 Apr 2018 18:14:05 +1000 Subject: [PATCH] Renamed CLIP to CLIP8 --- src/_imaging.c | 28 ++++++++++++++-------------- src/libImaging/Bands.c | 2 +- src/libImaging/Convert.c | 34 +++++++++++++++++----------------- src/libImaging/Effects.c | 2 +- src/libImaging/ImagingUtils.h | 2 +- src/libImaging/Unpack.c | 24 ++++++++++++------------ 6 files changed, 46 insertions(+), 46 deletions(-) diff --git a/src/_imaging.c b/src/_imaging.c index d9e6dff35..922c7bb8c 100644 --- a/src/_imaging.c +++ b/src/_imaging.c @@ -407,7 +407,7 @@ getlist(PyObject* arg, Py_ssize_t* length, const char* wrong_length, int type) switch (type) { case TYPE_UINT8: itemp = PyInt_AsLong(op); - ((UINT8*)list)[i] = CLIP(itemp); + ((UINT8*)list)[i] = CLIP8(itemp); break; case TYPE_INT32: itemp = PyInt_AsLong(op); @@ -527,7 +527,7 @@ getink(PyObject* color, Imaging im, char* ink) return NULL; } } - ink[0] = CLIP(r); + ink[0] = CLIP8(r); ink[1] = ink[2] = ink[3] = 0; } else { a = 255; @@ -547,10 +547,10 @@ getink(PyObject* color, Imaging im, char* ink) return NULL; } } - ink[0] = CLIP(r); - ink[1] = CLIP(g); - ink[2] = CLIP(b); - ink[3] = CLIP(a); + ink[0] = CLIP8(r); + ink[1] = CLIP8(g); + ink[2] = CLIP8(b); + ink[3] = CLIP8(a); } return ink; case IMAGING_TYPE_INT32: @@ -1282,17 +1282,17 @@ _point(ImagingObject* self, PyObject* args) im = ImagingPoint(self->image, mode, (void*) data); else if (mode && bands > 1) { for (i = 0; i < 256; i++) { - lut[i*4] = CLIP(data[i]); - lut[i*4+1] = CLIP(data[i+256]); - lut[i*4+2] = CLIP(data[i+512]); + lut[i*4] = CLIP8(data[i]); + lut[i*4+1] = CLIP8(data[i+256]); + lut[i*4+2] = CLIP8(data[i+512]); if (n > 768) - lut[i*4+3] = CLIP(data[i+768]); + lut[i*4+3] = CLIP8(data[i+768]); } im = ImagingPoint(self->image, mode, (void*) lut); } else { /* map individual bands */ for (i = 0; i < n; i++) - lut[i] = CLIP(data[i]); + lut[i] = CLIP8(data[i]); im = ImagingPoint(self->image, mode, (void*) lut); } free(data); @@ -1356,7 +1356,7 @@ _putdata(ImagingObject* self, PyObject* args) else /* Scaled and clipped string data */ for (i = x = y = 0; i < n; i++) { - image->image8[y][x] = CLIP((int) (p[i] * scale + offset)); + image->image8[y][x] = CLIP8((int) (p[i] * scale + offset)); if (++x >= (int) image->xsize) x = 0, y++; } @@ -1370,7 +1370,7 @@ _putdata(ImagingObject* self, PyObject* args) /* Clipped data */ for (i = x = y = 0; i < n; i++) { op = PySequence_Fast_GET_ITEM(seq, i); - image->image8[y][x] = (UINT8) CLIP(PyInt_AsLong(op)); + image->image8[y][x] = (UINT8) CLIP8(PyInt_AsLong(op)); if (++x >= (int) image->xsize){ x = 0, y++; } @@ -1380,7 +1380,7 @@ _putdata(ImagingObject* self, PyObject* args) /* Scaled and clipped data */ for (i = x = y = 0; i < n; i++) { PyObject *op = PySequence_Fast_GET_ITEM(seq, i); - image->image8[y][x] = CLIP( + image->image8[y][x] = CLIP8( (int) (PyFloat_AsDouble(op) * scale + offset)); if (++x >= (int) image->xsize){ x = 0, y++; diff --git a/src/libImaging/Bands.c b/src/libImaging/Bands.c index 58f4df1d9..e38e22819 100644 --- a/src/libImaging/Bands.c +++ b/src/libImaging/Bands.c @@ -211,7 +211,7 @@ ImagingFillBand(Imaging imOut, int band, int color) if (imOut->bands == 2 && band == 1) band = 3; - color = CLIP(color); + color = CLIP8(color); /* Insert color into image */ for (y = 0; y < imOut->ysize; y++) { diff --git a/src/libImaging/Convert.c b/src/libImaging/Convert.c index 582f9ca68..39ddf8721 100644 --- a/src/libImaging/Convert.c +++ b/src/libImaging/Convert.c @@ -140,7 +140,7 @@ la2lA(UINT8* out, const UINT8* in, int xsize) if (alpha == 255 || alpha == 0) { pixel = in[0]; } else { - pixel = CLIP((255 * in[0]) / alpha); + pixel = CLIP8((255 * in[0]) / alpha); } *out++ = (UINT8) pixel; *out++ = (UINT8) pixel; @@ -315,8 +315,8 @@ rgb2hsv(UINT8* out, const UINT8* in, int xsize) // incorrect hue happens if h/6 is negative. h = fmod((h/6.0 + 1.0), 1.0); - uh = (UINT8)CLIP((int)(h*255.0)); - us = (UINT8)CLIP((int)(s*255.0)); + uh = (UINT8)CLIP8((int)(h*255.0)); + us = (UINT8)CLIP8((int)(s*255.0)); *out++ = uh; *out++ = us; @@ -354,9 +354,9 @@ hsv2rgb(UINT8* out, const UINT8* in, int xsize) p = round((float)v * (1.0-fs)); q = round((float)v * (1.0-fs*f)); t = round((float)v * (1.0-fs*(1.0-f))); - up = (UINT8)CLIP(p); - uq = (UINT8)CLIP(q); - ut = (UINT8)CLIP(t); + up = (UINT8)CLIP8(p); + uq = (UINT8)CLIP8(q); + ut = (UINT8)CLIP8(t); switch (i%6) { case 0: @@ -465,9 +465,9 @@ rgba2rgbA(UINT8* out, const UINT8* in, int xsize) *out++ = in[1]; *out++ = in[2]; } else { - *out++ = CLIP((255 * in[0]) / alpha); - *out++ = CLIP((255 * in[1]) / alpha); - *out++ = CLIP((255 * in[2]) / alpha); + *out++ = CLIP8((255 * in[0]) / alpha); + *out++ = CLIP8((255 * in[1]) / alpha); + *out++ = CLIP8((255 * in[2]) / alpha); } *out++ = in[3]; } @@ -536,9 +536,9 @@ cmyk2rgb(UINT8* out, const UINT8* in, int xsize) int x, nk, tmp; for (x = 0; x < xsize; x++) { nk = 255 - in[3]; - out[0] = CLIP(nk - MULDIV255(in[0], nk, tmp)); - out[1] = CLIP(nk - MULDIV255(in[1], nk, tmp)); - out[2] = CLIP(nk - MULDIV255(in[2], nk, tmp)); + out[0] = CLIP8(nk - MULDIV255(in[0], nk, tmp)); + out[1] = CLIP8(nk - MULDIV255(in[1], nk, tmp)); + out[2] = CLIP8(nk - MULDIV255(in[2], nk, tmp)); out[3] = 255; out += 4; in += 4; @@ -1131,9 +1131,9 @@ topalette(Imaging imOut, Imaging imIn, ImagingPalette inpalette, int dither) int d2; INT16* cache; - r = CLIP(in[0] + (r + e[3+0])/16); - g = CLIP(in[1] + (g + e[3+1])/16); - b = CLIP(in[2] + (b + e[3+2])/16); + r = CLIP8(in[0] + (r + e[3+0])/16); + g = CLIP8(in[1] + (g + e[3+1])/16); + b = CLIP8(in[2] + (b + e[3+2])/16); /* get closest colour */ cache = &ImagingPaletteCache(palette, r, g, b); @@ -1235,7 +1235,7 @@ tobilevel(Imaging imOut, Imaging imIn, int dither) for (x = 0; x < imIn->xsize; x++) { /* pick closest colour */ - l = CLIP(in[x] + (l + errors[x+1])/16); + l = CLIP8(in[x] + (l + errors[x+1])/16); out[x] = (l > 128) ? 255 : 0; /* propagate errors */ @@ -1263,7 +1263,7 @@ tobilevel(Imaging imOut, Imaging imIn, int dither) for (x = 0; x < imIn->xsize; x++, in += 4) { /* pick closest colour */ - l = CLIP(L(in)/1000 + (l + errors[x+1])/16); + l = CLIP8(L(in)/1000 + (l + errors[x+1])/16); out[x] = (l > 128) ? 255 : 0; /* propagate errors */ diff --git a/src/libImaging/Effects.c b/src/libImaging/Effects.c index 1745302d9..7b4ff0b43 100644 --- a/src/libImaging/Effects.c +++ b/src/libImaging/Effects.c @@ -106,7 +106,7 @@ ImagingEffectNoise(int xsize, int ysize, float sigma) this = factor * v1; next = factor * v2; } - out[x] = CLIP(128 + sigma * this); + out[x] = CLIP8(128 + sigma * this); } } diff --git a/src/libImaging/ImagingUtils.h b/src/libImaging/ImagingUtils.h index ad29f0874..d25da80ae 100644 --- a/src/libImaging/ImagingUtils.h +++ b/src/libImaging/ImagingUtils.h @@ -30,7 +30,7 @@ (MULDIV255(in1, (255 - mask), tmp1) + in2) -#define CLIP(v) ((v) <= 0 ? 0 : (v) < 256 ? (v) : 255) +#define CLIP8(v) ((v) <= 0 ? 0 : (v) < 256 ? (v) : 255) /* This is to work around a bug in GCC prior 4.9 in 64 bit mode. GCC generates code with partial dependency which is 3 times slower. diff --git a/src/libImaging/Unpack.c b/src/libImaging/Unpack.c index dd849ce64..05b4299b0 100644 --- a/src/libImaging/Unpack.c +++ b/src/libImaging/Unpack.c @@ -747,9 +747,9 @@ unpackRGBa16L(UINT8* _out, const UINT8* in, int pixels) } else if (a == 255) { out[i] = MAKE_UINT32(in[1], in[3], in[5], a); } else { - out[i] = MAKE_UINT32(CLIP(in[1] * 255 / a), - CLIP(in[3] * 255 / a), - CLIP(in[5] * 255 / a), a); + out[i] = MAKE_UINT32(CLIP8(in[1] * 255 / a), + CLIP8(in[3] * 255 / a), + CLIP8(in[5] * 255 / a), a); } in += 8; } @@ -768,9 +768,9 @@ unpackRGBa16B(UINT8* _out, const UINT8* in, int pixels) } else if (a == 255) { out[i] = MAKE_UINT32(in[0], in[2], in[4], a); } else { - out[i] = MAKE_UINT32(CLIP(in[0] * 255 / a), - CLIP(in[2] * 255 / a), - CLIP(in[4] * 255 / a), a); + out[i] = MAKE_UINT32(CLIP8(in[0] * 255 / a), + CLIP8(in[2] * 255 / a), + CLIP8(in[4] * 255 / a), a); } in += 8; } @@ -789,9 +789,9 @@ unpackRGBa(UINT8* _out, const UINT8* in, int pixels) } else if (a == 255) { out[i] = MAKE_UINT32(in[0], in[1], in[2], a); } else { - out[i] = MAKE_UINT32(CLIP(in[0] * 255 / a), - CLIP(in[1] * 255 / a), - CLIP(in[2] * 255 / a), a); + out[i] = MAKE_UINT32(CLIP8(in[0] * 255 / a), + CLIP8(in[1] * 255 / a), + CLIP8(in[2] * 255 / a), a); } in += 4; } @@ -810,9 +810,9 @@ unpackBGRa(UINT8* _out, const UINT8* in, int pixels) } else if (a == 255) { out[i] = MAKE_UINT32(in[2], in[1], in[0], a); } else { - out[i] = MAKE_UINT32(CLIP(in[2] * 255 / a), - CLIP(in[1] * 255 / a), - CLIP(in[0] * 255 / a), a); + out[i] = MAKE_UINT32(CLIP8(in[2] * 255 / a), + CLIP8(in[1] * 255 / a), + CLIP8(in[0] * 255 / a), a); } in += 4; }