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

intermediate not normalized buffer for coefficients

Browse Source
This commit is contained in:
homm 2016-05-01 17:48:13 +03:00
parent a5b99dd302
commit 0e2a8e4323
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libImaging/Resample.c
View File

@ -104,7 +104,7 @@ ImagingResampleHorizontal(Imaging imIn, int xsize, int filter)
float center, ww, ss, ss0, ss1, ss2, ss3; float center, ww, ss, ss0, ss1, ss2, ss3;
int xx, yy, x, kmax, xmin, xmax; int xx, yy, x, kmax, xmin, xmax;
int *xbounds; int *xbounds;
float *k, *kk; float *k, *kk, *kw;
/* check filter */ /* check filter */
switch (filter) { switch (filter) {
@ -151,14 +151,21 @@ ImagingResampleHorizontal(Imaging imIn, int xsize, int filter)
if ( ! kk) if ( ! kk)
return (Imaging) ImagingError_MemoryError(); return (Imaging) ImagingError_MemoryError();
xbounds = malloc(xsize * 2 * sizeof(int)); /* intermediate not normalized buffer for coefficients */
if ( ! xbounds) { kw = malloc(kmax * sizeof(float));
if ( ! kw) {
free(kk); free(kk);
return (Imaging) ImagingError_MemoryError(); return (Imaging) ImagingError_MemoryError();
} }
xbounds = malloc(xsize * 2 * sizeof(int));
if ( ! xbounds) {
free(kk);
free(kw);
return (Imaging) ImagingError_MemoryError();
}
for (xx = 0; xx < xsize; xx++) { for (xx = 0; xx < xsize; xx++) {
k = &kk[xx * kmax];
center = (xx + 0.5) * scale; center = (xx + 0.5) * scale;
ww = 0.0; ww = 0.0;
ss = 1.0 / filterscale; ss = 1.0 / filterscale;
@ -169,18 +176,21 @@ ImagingResampleHorizontal(Imaging imIn, int xsize, int filter)
if (xmax > imIn->xsize) if (xmax > imIn->xsize)
xmax = imIn->xsize; xmax = imIn->xsize;
for (x = xmin; x < 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);
k[x - xmin] = w; kw[x - xmin] = w;
ww += w; ww += w;
} }
k = &kk[xx * kmax];
for (x = 0; x < xmax - xmin; x++) { for (x = 0; x < xmax - xmin; x++) {
if (ww != 0.0) if (ww != 0.0)
k[x] /= ww; k[x] = kw[x] / ww;
} }
xbounds[xx * 2 + 0] = xmin; xbounds[xx * 2 + 0] = xmin;
xbounds[xx * 2 + 1] = xmax; xbounds[xx * 2 + 1] = xmax;
} }
free(kw);
imOut = ImagingNew(imIn->mode, xsize, imIn->ysize); imOut = ImagingNew(imIn->mode, xsize, imIn->ysize);
if ( ! imOut) { if ( ! imOut) {
free(kk); free(kk);