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

significant speed improvement (about 55%)

Browse Source
This commit is contained in:
homm 2014-10-18 23:56:17 +04:00
parent 22668de6db
commit d91d7b9826
1 changed files with 42 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
libImaging/BoxBlur.c
View File

@ -202,7 +202,7 @@ HorizontalBoxBlur(Imaging im, Imaging imOut, float floatRadius)
); );
// Commit. // Commit.
for (x = 0; x < im->xsize; x++) { for (x = 0; x < im->xsize; x++) {
imOut->image8[x][y] = ((UINT8 *)lineOut)[x]; imOut->image8[y][x] = ((UINT8 *)lineOut)[x];
} }
} }
} }
@ -218,7 +218,7 @@ HorizontalBoxBlur(Imaging im, Imaging imOut, float floatRadius)
); );
// Commit. // Commit.
for (x = 0; x < im->xsize; x++) { for (x = 0; x < im->xsize; x++) {
imOut->image32[x][y] = lineOut[x]; imOut->image32[y][x] = lineOut[x];
} }
} }
} }
@ -230,6 +230,42 @@ HorizontalBoxBlur(Imaging im, Imaging imOut, float floatRadius)
return imOut; return imOut;
} }
void
TransposeImage(Imaging im, Imaging imOut)
{
int x, y, xx, yy, xxsize, yysize;
int size = 64;
if (im->image8)
{
for (y = 0; y < im->ysize; y += size) {
for (x = 0; x < im->xsize; x += size) {
yysize = MIN(size, im->ysize - y);
xxsize = MIN(size, im->xsize - x);
for (yy = 0; yy < yysize; yy++) {
for (xx = 0; xx < xxsize; xx++) {
imOut->image8[x + xx][y + yy] = im->image8[y + yy][x + xx];
}
}
}
}
}
else
{
for (y = 0; y < im->ysize; y += size) {
for (x = 0; x < im->xsize; x += size) {
yysize = MIN(size, im->ysize - y);
xxsize = MIN(size, im->xsize - x);
for (yy = 0; yy < yysize; yy++) {
for (xx = 0; xx < xxsize; xx++) {
imOut->image32[x + xx][y + yy] = im->image32[y + yy][x + xx];
}
}
}
}
}
}
Imaging Imaging
ImagingBoxBlur(Imaging im, Imaging imOut, float radius) ImagingBoxBlur(Imaging im, Imaging imOut, float radius)
@ -259,12 +295,14 @@ ImagingBoxBlur(Imaging im, Imaging imOut, float radius)
/* Apply one-dimensional blur. /* Apply one-dimensional blur.
HorizontalBoxBlur32 transposes image at same time. */ HorizontalBoxBlur32 transposes image at same time. */
HorizontalBoxBlur(im, temp, radius); HorizontalBoxBlur(im, imOut, radius);
TransposeImage(imOut, temp);
/* Blur transposed result from previout step in same direction. /* Blur transposed result from previout step in same direction.
Reseult will be transposed again. We'll get original image Reseult will be transposed again. We'll get original image
blurred in both directions. */ blurred in both directions. */
HorizontalBoxBlur(temp, imOut, radius); HorizontalBoxBlur(temp, temp, radius);
TransposeImage(temp, imOut);
ImagingDelete(temp); ImagingDelete(temp);