python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-07-04 03:43:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

move ww into coefficients

Browse Source
This commit is contained in:
homm 2014-10-25 05:50:54 +04:00
parent 01b947c602
commit e276e6a535
1 changed files with 20 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
libImaging/Antialias.c
View File

@ -140,7 +140,7 @@ ImagingStretchHorizaontal(Imaging imOut, Imaging imIn, int filter)
if ( ! kk) if ( ! kk)
return (Imaging) ImagingError_MemoryError(); return (Imaging) ImagingError_MemoryError();
xbounds = malloc(imOut->xsize * 3 * sizeof(float)); xbounds = malloc(imOut->xsize * 2 * sizeof(float));
if ( ! xbounds) { if ( ! xbounds) {
free(kk); free(kk);
return (Imaging) ImagingError_MemoryError(); return (Imaging) ImagingError_MemoryError();
@ -160,15 +160,14 @@ ImagingStretchHorizaontal(Imaging imOut, Imaging imIn, int filter)
for (x = (int) xmin; x < (int) xmax; x++) { for (x = (int) xmin; x < (int) 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 - (int) xmin] = w;
ww = ww + w; ww += w;
} }
if (ww == 0.0) for (x = 0; x < (int) xmax - (int) xmin; x++) {
ww = 1.0; if (ww != 0.0)
else k[x] /= ww;
ww = 1.0 / ww; }
xbounds[xx * 3 + 0] = xmin; xbounds[xx * 2 + 0] = xmin;
xbounds[xx * 3 + 1] = xmax; xbounds[xx * 2 + 1] = xmax;
xbounds[xx * 3 + 2] = ww;
} }
ImagingSectionEnter(&cookie); ImagingSectionEnter(&cookie);
@ -177,14 +176,12 @@ ImagingStretchHorizaontal(Imaging imOut, Imaging imIn, int filter)
if (imIn->image8) { if (imIn->image8) {
/* 8-bit grayscale */ /* 8-bit grayscale */
for (xx = 0; xx < imOut->xsize; xx++) { for (xx = 0; xx < imOut->xsize; xx++) {
xmin = xbounds[xx * 3 + 0]; xmin = xbounds[xx * 2 + 0];
xmax = xbounds[xx * 3 + 1]; xmax = xbounds[xx * 2 + 1];
ww = xbounds[xx * 3 + 2];
k = &kk[xx * kmax]; k = &kk[xx * kmax];
ss = 0.0; ss = 0.5;
for (x = (int) xmin; x < (int) xmax; x++) for (x = (int) xmin; x < (int) xmax; x++)
ss = ss + imIn->image8[yy][x] * k[x - (int) xmin]; ss = ss + imIn->image8[yy][x] * k[x - (int) xmin];
ss = ss * ww + 0.5;
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)
@ -197,17 +194,15 @@ ImagingStretchHorizaontal(Imaging imOut, Imaging imIn, int filter)
case IMAGING_TYPE_UINT8: case IMAGING_TYPE_UINT8:
/* n-bit grayscale */ /* n-bit grayscale */
for (xx = 0; xx < imOut->xsize; xx++) { for (xx = 0; xx < imOut->xsize; xx++) {
xmin = xbounds[xx * 3 + 0]; xmin = xbounds[xx * 2 + 0];
xmax = xbounds[xx * 3 + 1]; xmax = xbounds[xx * 2 + 1];
ww = xbounds[xx * 3 + 2];
k = &kk[xx * kmax]; k = &kk[xx * kmax];
for (b = 0; b < imIn->bands; b++) { for (b = 0; b < imIn->bands; b++) {
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.0; ss = 0.5;
for (x = (int) xmin; x < (int) xmax; x++) for (x = (int) xmin; x < (int) 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 - (int) xmin];
ss = ss * ww + 0.5;
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)
@ -220,27 +215,25 @@ ImagingStretchHorizaontal(Imaging imOut, Imaging imIn, int filter)
case IMAGING_TYPE_INT32: case IMAGING_TYPE_INT32:
/* 32-bit integer */ /* 32-bit integer */
for (xx = 0; xx < imOut->xsize; xx++) { for (xx = 0; xx < imOut->xsize; xx++) {
xmin = xbounds[xx * 3 + 0]; xmin = xbounds[xx * 2 + 0];
xmax = xbounds[xx * 3 + 1]; xmax = xbounds[xx * 2 + 1];
ww = xbounds[xx * 3 + 2];
k = &kk[xx * kmax]; k = &kk[xx * kmax];
ss = 0.0; ss = 0.0;
for (x = (int) xmin; x < (int) xmax; x++) for (x = (int) xmin; x < (int) xmax; x++)
ss = ss + IMAGING_PIXEL_I(imIn, x, yy) * k[x - (int) xmin]; ss = ss + IMAGING_PIXEL_I(imIn, x, yy) * k[x - (int) xmin];
IMAGING_PIXEL_I(imOut, xx, yy) = (int) ss * ww; IMAGING_PIXEL_I(imOut, xx, yy) = (int) ss;
} }
break; break;
case IMAGING_TYPE_FLOAT32: case IMAGING_TYPE_FLOAT32:
/* 32-bit float */ /* 32-bit float */
for (xx = 0; xx < imOut->xsize; xx++) { for (xx = 0; xx < imOut->xsize; xx++) {
xmin = xbounds[xx * 3 + 0]; xmin = xbounds[xx * 2 + 0];
xmax = xbounds[xx * 3 + 1]; xmax = xbounds[xx * 2 + 1];
ww = xbounds[xx * 3 + 2];
k = &kk[xx * kmax]; k = &kk[xx * kmax];
ss = 0.0; ss = 0.0;
for (x = (int) xmin; x < (int) xmax; x++) for (x = (int) xmin; x < (int) xmax; x++)
ss = ss + IMAGING_PIXEL_F(imIn, x, yy) * k[x - (int) xmin]; ss = ss + IMAGING_PIXEL_F(imIn, x, yy) * k[x - (int) xmin];
IMAGING_PIXEL_F(imOut, xx, yy) = ss * ww; IMAGING_PIXEL_F(imOut, xx, yy) = ss;
} }
break; break;
default: default: