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

Merge branch 'master' into fast-filters

Browse Source 
# Conflicts:
#	libImaging/Filter.c
This commit is contained in:
Alexander 2017-08-12 23:52:31 +03:00
commit 55f153d999
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libImaging/Filter.c
View File

@ -41,6 +41,7 @@ ImagingExpand(Imaging imIn, int xmargin, int ymargin, int mode)
{ {
Imaging imOut; Imaging imOut;
int x, y; int x, y;
ImagingSectionCookie cookie;
if (xmargin < 0 && ymargin < 0) if (xmargin < 0 && ymargin < 0)
return (Imaging) ImagingError_ValueError("bad kernel size"); return (Imaging) ImagingError_ValueError("bad kernel size");
@ -70,11 +71,13 @@ ImagingExpand(Imaging imIn, int xmargin, int ymargin, int mode)
EXPAND_LINE(type, image, imIn->ysize-1, ymargin+imIn->ysize+y);\ EXPAND_LINE(type, image, imIn->ysize-1, ymargin+imIn->ysize+y);\
} }
ImagingSectionEnter(&cookie);
if (imIn->image8) { if (imIn->image8) {
EXPAND(UINT8, image8); EXPAND(UINT8, image8);
} else { } else {
EXPAND(INT32, image32); EXPAND(INT32, image32);
} }
ImagingSectionLeave(&cookie);
ImagingCopyInfo(imOut, imIn); ImagingCopyInfo(imOut, imIn);
@ -122,6 +125,7 @@ ImagingFilter(Imaging im, int xsize, int ysize, const FLOAT32* kernel,
{ {
Imaging imOut; Imaging imOut;
int x, y; int x, y;
ImagingSectionCookie cookie;
if (!im || strcmp(im->mode, "L") != 0) if (!im || strcmp(im->mode, "L") != 0)
return (Imaging) ImagingError_ModeError(); return (Imaging) ImagingError_ModeError();
@ -166,6 +170,7 @@ ImagingFilter(Imaging im, int xsize, int ysize, const FLOAT32* kernel,
(int) image[y-2][x+d] * kernel[23] + \ (int) image[y-2][x+d] * kernel[23] + \
(int) image[y-2][x+d+d] * kernel[24]) (int) image[y-2][x+d+d] * kernel[24])
ImagingSectionEnter(&cookie);
if (xsize == 3) { if (xsize == 3) {
/* 3x3 kernel. */ /* 3x3 kernel. */
ImagingFilter3x3(imOut, im, kernel, offset); ImagingFilter3x3(imOut, im, kernel, offset);
@ -186,6 +191,7 @@ ImagingFilter(Imaging im, int xsize, int ysize, const FLOAT32* kernel,
memcpy(imOut->image[y], im->image[y], im->linesize); memcpy(imOut->image[y], im->image[y], im->linesize);
memcpy(imOut->image[y+1], im->image[y+1], im->linesize); memcpy(imOut->image[y+1], im->image[y+1], im->linesize);
} }
ImagingSectionLeave(&cookie);
return imOut; return imOut;
} }