python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-12-26 18:06:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

make x indexes int

Browse Source
This commit is contained in:
homm 2014-10-25 05:57:08 +04:00
parent e276e6a535
commit a484d28d1f
1 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
libImaging/Antialias.c
View File

@ -87,9 +87,10 @@ ImagingStretchHorizaontal(Imaging imOut, Imaging imIn, int filter)
ImagingSectionCookie cookie; ImagingSectionCookie cookie;
struct filter *filterp; struct filter *filterp;
float support, scale, filterscale; float support, scale, filterscale;
float center, ww, ss, xmin, xmax; float center, ww, ss;
int xx, yy, x, b, kmax; int xx, yy, x, b, kmax, xmin, xmax;
float *k, *kk, *xbounds; int *xbounds;
float *k, *kk;
/* check modes */ /* check modes */
if (!imOut || !imIn || strcmp(imIn->mode, imOut->mode) != 0) if (!imOut || !imIn || strcmp(imIn->mode, imOut->mode) != 0)
@ -140,7 +141,7 @@ ImagingStretchHorizaontal(Imaging imOut, Imaging imIn, int filter)
if ( ! kk) if ( ! kk)
return (Imaging) ImagingError_MemoryError(); return (Imaging) ImagingError_MemoryError();
xbounds = malloc(imOut->xsize * 2 * sizeof(float)); xbounds = malloc(imOut->xsize * 2 * sizeof(int));
if ( ! xbounds) { if ( ! xbounds) {
free(kk); free(kk);
return (Imaging) ImagingError_MemoryError(); return (Imaging) ImagingError_MemoryError();
@ -151,18 +152,18 @@ ImagingStretchHorizaontal(Imaging imOut, Imaging imIn, int filter)
center = (xx + 0.5) * scale; center = (xx + 0.5) * scale;
ww = 0.0; ww = 0.0;
ss = 1.0 / filterscale; ss = 1.0 / filterscale;
xmin = floor(center - support); xmin = (int) floor(center - support);
if (xmin < 0.0) if (xmin < 0)
xmin = 0.0; xmin = 0;
xmax = ceil(center + support); xmax = (int) ceil(center + support);
if (xmax > (float) imIn->xsize) if (xmax > imIn->xsize)
xmax = (float) imIn->xsize; xmax = imIn->xsize;
for (x = (int) xmin; x < (int) xmax; x++) { for (x = xmin; x < xmax; x++) {
float w = filterp->filter((x - center + 0.5) * ss) * ss; float w = filterp->filter((x - center + 0.5) * ss) * ss;
k[x - (int) xmin] = w; k[x - xmin] = w;
ww += w; ww += w;
} }
for (x = 0; x < (int) xmax - (int) xmin; x++) { for (x = 0; x < xmax - xmin; x++) {
if (ww != 0.0) if (ww != 0.0)
k[x] /= ww; k[x] /= ww;
} }
@ -180,8 +181,8 @@ ImagingStretchHorizaontal(Imaging imOut, Imaging imIn, int filter)
xmax = xbounds[xx * 2 + 1]; xmax = xbounds[xx * 2 + 1];
k = &kk[xx * kmax]; k = &kk[xx * kmax];
ss = 0.5; ss = 0.5;
for (x = (int) xmin; x < (int) xmax; x++) for (x = xmin; x < xmax; x++)
ss = ss + imIn->image8[yy][x] * k[x - (int) xmin]; ss = ss + imIn->image8[yy][x] * k[x - xmin];
if (ss < 0.5) if (ss < 0.5)
imOut->image8[yy][xx] = (UINT8) 0; imOut->image8[yy][xx] = (UINT8) 0;
else if (ss >= 255.0) else if (ss >= 255.0)
@ -201,8 +202,8 @@ ImagingStretchHorizaontal(Imaging imOut, Imaging imIn, int filter)
if (imIn->bands == 2 && b) if (imIn->bands == 2 && b)
b = 3; /* hack to deal with LA images */ b = 3; /* hack to deal with LA images */
ss = 0.5; ss = 0.5;
for (x = (int) xmin; x < (int) xmax; x++) for (x = xmin; x < xmax; x++)
ss = ss + (UINT8) imIn->image[yy][x*4+b] * k[x - (int) xmin]; ss = ss + (UINT8) imIn->image[yy][x*4+b] * k[x - xmin];
if (ss < 0.5) if (ss < 0.5)
imOut->image[yy][xx*4+b] = (UINT8) 0; imOut->image[yy][xx*4+b] = (UINT8) 0;
else if (ss >= 255.0) else if (ss >= 255.0)
@ -219,8 +220,8 @@ ImagingStretchHorizaontal(Imaging imOut, Imaging imIn, int filter)
xmax = xbounds[xx * 2 + 1]; xmax = xbounds[xx * 2 + 1];
k = &kk[xx * kmax]; k = &kk[xx * kmax];
ss = 0.0; ss = 0.0;
for (x = (int) xmin; x < (int) xmax; x++) for (x = xmin; x < xmax; x++)
ss = ss + IMAGING_PIXEL_I(imIn, x, yy) * k[x - (int) xmin]; ss = ss + IMAGING_PIXEL_I(imIn, x, yy) * k[x - xmin];
IMAGING_PIXEL_I(imOut, xx, yy) = (int) ss; IMAGING_PIXEL_I(imOut, xx, yy) = (int) ss;
} }
break; break;
@ -231,8 +232,8 @@ ImagingStretchHorizaontal(Imaging imOut, Imaging imIn, int filter)
xmax = xbounds[xx * 2 + 1]; xmax = xbounds[xx * 2 + 1];
k = &kk[xx * kmax]; k = &kk[xx * kmax];
ss = 0.0; ss = 0.0;
for (x = (int) xmin; x < (int) xmax; x++) for (x = xmin; x < xmax; x++)
ss = ss + IMAGING_PIXEL_F(imIn, x, yy) * k[x - (int) xmin]; ss = ss + IMAGING_PIXEL_F(imIn, x, yy) * k[x - xmin];
IMAGING_PIXEL_F(imOut, xx, yy) = ss; IMAGING_PIXEL_F(imOut, xx, yy) = ss;
} }
break; break;