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

update ImagingReduceCorners() to switch on pixelsize and handle pixelsize=2

Browse Source
This commit is contained in:
Yay295 2022-08-25 08:46:03 -05:00
parent 485729884a
commit c2ca63686d
1 changed files with 59 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/libImaging/Reduce.c
View File

@ -1073,7 +1073,7 @@ ImagingReduceCorners(Imaging imOut, Imaging imIn, int box[4], int xscale, int ys
*/ */
int x, y, xx, yy; int x, y, xx, yy;
if (imIn->image8) { if (imIn->pixelsize == 1) {
if (box[2] % xscale) { if (box[2] % xscale) {
int scale = (box[2] % xscale) * yscale; int scale = (box[2] % xscale) * yscale;
const UINT32 multiplier = division_UINT32(scale, 8); const UINT32 multiplier = division_UINT32(scale, 8);
@ -1124,7 +1124,64 @@ ImagingReduceCorners(Imaging imOut, Imaging imIn, int box[4], int xscale, int ys
} }
((UINT8 *)imOut->image[y])[x] = (ss * multiplier) >> 24; ((UINT8 *)imOut->image[y])[x] = (ss * multiplier) >> 24;
} }
} else { } else if (imIn->pixelsize == 2) {
if (box[2] % xscale) {
int scale = (box[2] % xscale) * yscale;
const UINT32 multiplier = division_UINT32(scale, 8);
const UINT32 amend = scale / 2;
for (y = 0; y < box[3] / yscale; y++) {
const int yy_from = box[1] + y * yscale;
UINT32 ss0 = amend, ss1 = amend;
x = box[2] / xscale;
for (yy = yy_from; yy < yy_from + yscale; yy++) {
const UINT8 *line = (UINT8 *)imIn->image[yy];
for (xx = box[0] + x * xscale; xx < box[0] + box[2]; xx++) {
ss0 += line[xx * 2 + 0];
ss1 += line[xx * 2 + 1];
}
}
((UINT8 *)imOut->image[y])[x + 0] = (ss0 * multiplier) >> 24;
((UINT8 *)imOut->image[y])[x + 1] = (ss1 * multiplier) >> 24;
}
}
if (box[3] % yscale) {
int scale = xscale * (box[3] % yscale);
const UINT32 multiplier = division_UINT32(scale, 8);
const UINT32 amend = scale / 2;
y = box[3] / yscale;
for (x = 0; x < box[2] / xscale; x++) {
const int xx_from = box[0] + x * xscale;
UINT32 ss0 = amend, ss1 = amend;
for (yy = box[1] + y * yscale; yy < box[1] + box[3]; yy++) {
const UINT8 *line = (UINT8 *)imIn->image[yy];
for (xx = xx_from; xx < xx_from + xscale; xx++) {
ss0 += line[xx * 2 + 0];
ss1 += line[xx * 2 + 1];
}
}
((UINT8 *)imOut->image[y])[x + 0] = (ss0 * multiplier) >> 24;
((UINT8 *)imOut->image[y])[x + 1] = (ss1 * multiplier) >> 24;
}
}
if (box[2] % xscale && box[3] % yscale) {
int scale = (box[2] % xscale) * (box[3] % yscale);
const UINT32 multiplier = division_UINT32(scale, 8);
const UINT32 amend = scale / 2;
UINT32 ss0 = amend, ss1 = amend;
x = box[2] / xscale;
y = box[3] / yscale;
for (yy = box[1] + y * yscale; yy < box[1] + box[3]; yy++) {
const UINT8 *line = (UINT8 *)imIn->image[yy];
for (xx = box[0] + x * xscale; xx < box[0] + box[2]; xx++) {
ss0 += line[xx * 2 + 0];
ss1 += line[xx * 2 + 1];
}
}
((UINT8 *)imOut->image[y])[x + 0] = (ss0 * multiplier) >> 24;
((UINT8 *)imOut->image[y])[x + 1] = (ss1 * multiplier) >> 24;
}
} else if (imIn->pixelsize == 4) {
if (box[2] % xscale) { if (box[2] % xscale) {
int scale = (box[2] % xscale) * yscale; int scale = (box[2] % xscale) * yscale;
const UINT32 multiplier = division_UINT32(scale, 8); const UINT32 multiplier = division_UINT32(scale, 8);