python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-01-28 18:24:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

pass struct filter to ImagingResampleHorizontal

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

42
libImaging/Resample.c
View File

@ -95,34 +95,16 @@ static float inline i2f(int v) { return (float) v; }
Imaging Imaging
ImagingResampleHorizontal(Imaging imIn, int xsize, int filter) ImagingResampleHorizontal(Imaging imIn, int xsize, struct filter *filterp)
{ {
ImagingSectionCookie cookie; ImagingSectionCookie cookie;
Imaging imOut; Imaging imOut;
struct filter *filterp;
float support, scale, filterscale; float support, scale, filterscale;
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, *kw; float *k, *kk, *kw;
/* check filter */
switch (filter) {
case IMAGING_TRANSFORM_LANCZOS:
filterp = &LANCZOS;
break;
case IMAGING_TRANSFORM_BILINEAR:
filterp = &BILINEAR;
break;
case IMAGING_TRANSFORM_BICUBIC:
filterp = &BICUBIC;
break;
default:
return (Imaging) ImagingError_ValueError(
"unsupported resampling filter"
);
}
/* prepare for horizontal stretch */ /* prepare for horizontal stretch */
filterscale = scale = (float) imIn->xsize / xsize; filterscale = scale = (float) imIn->xsize / xsize;
@ -302,6 +284,7 @@ ImagingResample(Imaging imIn, int xsize, int ysize, int filter)
{ {
Imaging imTemp1, imTemp2, imTemp3; Imaging imTemp1, imTemp2, imTemp3;
Imaging imOut; Imaging imOut;
struct filter *filterp;
if (strcmp(imIn->mode, "P") == 0 || strcmp(imIn->mode, "1") == 0) if (strcmp(imIn->mode, "P") == 0 || strcmp(imIn->mode, "1") == 0)
return (Imaging) ImagingError_ModeError(); return (Imaging) ImagingError_ModeError();
@ -309,8 +292,25 @@ ImagingResample(Imaging imIn, int xsize, int ysize, int filter)
if (imIn->type == IMAGING_TYPE_SPECIAL) if (imIn->type == IMAGING_TYPE_SPECIAL)
return (Imaging) ImagingError_ModeError(); return (Imaging) ImagingError_ModeError();
/* check filter */
switch (filter) {
case IMAGING_TRANSFORM_LANCZOS:
filterp = &LANCZOS;
break;
case IMAGING_TRANSFORM_BILINEAR:
filterp = &BILINEAR;
break;
case IMAGING_TRANSFORM_BICUBIC:
filterp = &BICUBIC;
break;
default:
return (Imaging) ImagingError_ValueError(
"unsupported resampling filter"
);
}
/* two-pass resize, first pass */ /* two-pass resize, first pass */
imTemp1 = ImagingResampleHorizontal(imIn, xsize, filter); imTemp1 = ImagingResampleHorizontal(imIn, xsize, filterp);
if ( ! imTemp1) if ( ! imTemp1)
return NULL; return NULL;
@ -321,7 +321,7 @@ ImagingResample(Imaging imIn, int xsize, int ysize, int filter)
return NULL; return NULL;
/* second pass */ /* second pass */
imTemp3 = ImagingResampleHorizontal(imTemp2, ysize, filter); imTemp3 = ImagingResampleHorizontal(imTemp2, ysize, filterp);
ImagingDelete(imTemp2); ImagingDelete(imTemp2);
if ( ! imTemp3) if ( ! imTemp3)
return NULL; return NULL;