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

Fix need_horizontal and need_vertical conditions in resample

Browse Source
This commit is contained in:
Alexander 2017-09-01 00:23:02 +03:00
parent edcbd3f67d
commit 0acc2cea9c
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libImaging/Resample.c
View File

@ -553,12 +553,15 @@ ImagingResampleInner(Imaging imIn, int xsize, int ysize,
Imaging imTemp = NULL; Imaging imTemp = NULL;
Imaging imOut = NULL; Imaging imOut = NULL;
int i; int i, need_horizontal, need_vertical;
int ybox_first, ybox_last; int ybox_first, ybox_last;
int ksize_horiz, ksize_vert; int ksize_horiz, ksize_vert;
int *bounds_horiz, *bounds_vert; int *bounds_horiz, *bounds_vert;
double *kk_horiz, *kk_vert; double *kk_horiz, *kk_vert;
need_horizontal = xsize != imIn->xsize || box[0] || box[2] != xsize;
need_vertical = ysize != imIn->ysize || box[1] || box[3] != ysize;
ksize_horiz = precompute_coeffs(imIn->xsize, box[0], box[2], xsize, ksize_horiz = precompute_coeffs(imIn->xsize, box[0], box[2], xsize,
filterp, &bounds_horiz, &kk_horiz); filterp, &bounds_horiz, &kk_horiz);
if ( ! ksize_horiz) { if ( ! ksize_horiz) {
@ -579,8 +582,8 @@ ImagingResampleInner(Imaging imIn, int xsize, int ysize,
ybox_last = bounds_vert[ysize*2 - 2] + bounds_vert[ysize*2 - 1]; ybox_last = bounds_vert[ysize*2 - 2] + bounds_vert[ysize*2 - 1];
/* two-pass resize, first pass */ /* two-pass resize, horizontal pass */
if (box[0] || box[2] != xsize) { if (need_horizontal) {
// Shift bounds for vertical pass // Shift bounds for vertical pass
for (i = 0; i < ysize; i++) { for (i = 0; i < ysize; i++) {
bounds_vert[i * 2] -= ybox_first; bounds_vert[i * 2] -= ybox_first;
@ -605,8 +608,8 @@ ImagingResampleInner(Imaging imIn, int xsize, int ysize,
free(kk_horiz); free(kk_horiz);
} }
/* second pass */ /* vertical pass */
if (box[1] || box[3] != ysize) { if (need_vertical) {
imOut = ImagingNewDirty(imIn->mode, imIn->xsize, ysize); imOut = ImagingNewDirty(imIn->mode, imIn->xsize, ysize);
if (imOut) { if (imOut) {
/* imIn can be the original image or horizontally resampled one */ /* imIn can be the original image or horizontally resampled one */