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

do 3x3 filtering in separate function

Browse Source
This commit is contained in:
Alexander 2017-08-12 23:07:08 +03:00
parent 5353d28e35
commit 38eab1a43f
1 changed files with 37 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
libImaging/Filter.c
View File

@ -81,13 +81,47 @@ ImagingExpand(Imaging imIn, int xmargin, int ymargin, int mode)
return imOut; return imOut;
} }
void
ImagingFilter3x3(Imaging imOut, Imaging im, const float* kernel,
float offset)
{
#define KERNEL3x3(in_1, in, in1, kernel, d) ( \
(UINT8) in1[x-d] * kernel[0] + \
(UINT8) in1[x] * kernel[1] + \
(UINT8) in1[x+d] * kernel[2] + \
(UINT8) in0[x-d] * kernel[3] + \
(UINT8) in0[x] * kernel[4] + \
(UINT8) in0[x+d] * kernel[5] + \
(UINT8) in_1[x-d] * kernel[6] + \
(UINT8) in_1[x] * kernel[7] + \
(UINT8) in_1[x+d] * kernel[8])
int x, y;
memcpy(imOut->image[0], im->image[0], im->linesize);
for (y = 1; y < im->ysize-1; y++) {
UINT8* in_1 = (UINT8*) im->image[y-1];
UINT8* in0 = (UINT8*) im->image[y];
UINT8* in1 = (UINT8*) im->image[y+1];
UINT8* out = (UINT8*) imOut->image[y];
out[0] = in0[0];
for (x = 1; x < im->xsize-1; x++) {
float sum = KERNEL3x3(in_1, in, in1, kernel, 1) + offset;
out[x] = clip8(sum);
}
out[x] = in0[x];
}
memcpy(imOut->image[y], im->image[y], im->linesize);
}
Imaging Imaging
ImagingFilter(Imaging im, int xsize, int ysize, const FLOAT32* kernel, ImagingFilter(Imaging im, int xsize, int ysize, const FLOAT32* kernel,
FLOAT32 offset) FLOAT32 offset)
{ {
Imaging imOut; Imaging imOut;
int x, y; int x, y;
FLOAT32 sum;
if (!im || strcmp(im->mode, "L") != 0) if (!im || strcmp(im->mode, "L") != 0)
return (Imaging) ImagingError_ModeError(); return (Imaging) ImagingError_ModeError();
@ -102,18 +136,6 @@ ImagingFilter(Imaging im, int xsize, int ysize, const FLOAT32* kernel,
if (!imOut) if (!imOut)
return NULL; return NULL;
/* brute force kernel implementations */
#define KERNEL3x3(image, kernel, d) ( \
(int) image[y+1][x-d] * kernel[0] + \
(int) image[y+1][x] * kernel[1] + \
(int) image[y+1][x+d] * kernel[2] + \
(int) image[y][x-d] * kernel[3] + \
(int) image[y][x] * kernel[4] + \
(int) image[y][x+d] * kernel[5] + \
(int) image[y-1][x-d] * kernel[6] + \
(int) image[y-1][x] * kernel[7] + \
(int) image[y-1][x+d] * kernel[8])
#define KERNEL5x5(image, kernel, d) ( \ #define KERNEL5x5(image, kernel, d) ( \
(int) image[y+2][x-d-d] * kernel[0] + \ (int) image[y+2][x-d-d] * kernel[0] + \
(int) image[y+2][x-d] * kernel[1] + \ (int) image[y+2][x-d] * kernel[1] + \
@ -143,16 +165,7 @@ ImagingFilter(Imaging im, int xsize, int ysize, const FLOAT32* kernel,
if (xsize == 3) { if (xsize == 3) {
/* 3x3 kernel. */ /* 3x3 kernel. */
memcpy(imOut->image[0], im->image[0], im->linesize); ImagingFilter3x3(imOut, im, kernel, offset);
for (y = 1; y < im->ysize-1; y++) {
imOut->image8[y][0] = im->image8[y][0];
for (x = 1; x < im->xsize-1; x++) {
sum = KERNEL3x3(im->image8, kernel, 1) + offset;
imOut->image8[y][x] = clip8(sum);
}
imOut->image8[y][x] = im->image8[y][x];
}
memcpy(imOut->image[y], im->image[y], im->linesize);
} else { } else {
/* 5x5 kernel. */ /* 5x5 kernel. */
memcpy(imOut->image[0], im->image[0], im->linesize); memcpy(imOut->image[0], im->image[0], im->linesize);
@ -161,7 +174,7 @@ ImagingFilter(Imaging im, int xsize, int ysize, const FLOAT32* kernel,
for (x = 0; x < 2; x++) for (x = 0; x < 2; x++)
imOut->image8[y][x] = im->image8[y][x]; imOut->image8[y][x] = im->image8[y][x];
for (; x < im->xsize-2; x++) { for (; x < im->xsize-2; x++) {
sum = KERNEL5x5(im->image8, kernel, 1) + offset; float sum = KERNEL5x5(im->image8, kernel, 1) + offset;
imOut->image8[y][x] = clip8(sum); imOut->image8[y][x] = clip8(sum);
} }
for (; x < im->xsize; x++) for (; x < im->xsize; x++)