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

rename vars

Browse Source
This commit is contained in:
homm 2014-10-12 02:59:21 +04:00
parent 5bb0cfa17a
commit 091b15f9d5
1 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
libImaging/UnsharpMask.c
View File

@ -20,16 +20,14 @@ static inline UINT8 clip(double in)
} }
static Imaging static Imaging
gblur(Imaging im, Imaging imOut, float floatRadius, int channels) gblur(Imaging im, Imaging imOut, float radius, int channels)
{ {
ImagingSectionCookie cookie; ImagingSectionCookie cookie;
float *maskData = NULL; float *maskData = NULL;
int y = 0; int y = 0;
int x = 0; int x = 0;
int z = 0;
float sum = 0.0; float sum = 0.0;
float dev = 0.0;
float *buffer = NULL; float *buffer = NULL;
@ -42,12 +40,10 @@ gblur(Imaging im, Imaging imOut, float floatRadius, int channels)
int offset = 0; int offset = 0;
INT32 newPixelFinals; INT32 newPixelFinals;
int radius = 0; int effectiveRadius = 0;
int diameter = 0; int window = 0;
int hasAlpha = 0; int hasAlpha = 0;
int i;
/* Do the gaussian blur */ /* Do the gaussian blur */
/* For a symmetrical gaussian blur, instead of doing a radius*radius /* For a symmetrical gaussian blur, instead of doing a radius*radius
@ -57,33 +53,33 @@ gblur(Imaging im, Imaging imOut, float floatRadius, int channels)
radius of 5 instead of 25 lookups). So, we blur the lines first, radius of 5 instead of 25 lookups). So, we blur the lines first,
then we blur the resulting columns. */ then we blur the resulting columns. */
/* Next, double the radius and offset by 2.0... that way "0" returns /* Only pixels in effective radius from source pixel are accounted.
the original image instead of a black one. We multiply it by 2.0 The Gaussian values outside 3 x radius is near zero. */
so that it is a true "radius", not a diameter (the results match effectiveRadius = (int) ceil(radius * 2.57);
other paint programs closer that way too). */ /* Window is number of pixels forming the result pixel on one axis.
radius = (int) ceil(floatRadius * 2.57); It is source pixel and effective radius in both directions. */
diameter = radius * 2 + 1; window = effectiveRadius * 2 + 1;
/* create the maskData for the gaussian curve */ /* create the maskData for the gaussian curve */
maskData = malloc(diameter * sizeof(float)); maskData = malloc(window * sizeof(float));
for (x = 0; x < diameter; x++) { for (pix = 0; pix < window; pix++) {
z = x - radius; offset = pix - effectiveRadius;
dev = floatRadius * floatRadius;
/* http://en.wikipedia.org/wiki/Gaussian_blur /* http://en.wikipedia.org/wiki/Gaussian_blur
"1 / sqrt(2 * pi * dev)" is constant and will be eliminated by "1 / sqrt(2 * pi * dev)" is constant and will be eliminated by
normalization. */ normalization. */
maskData[x] = pow(2.718281828459, -z * z / (2 * dev)); maskData[pix] = pow(2.718281828459,
-offset * offset / (2 * radius * radius));
} }
for (x = 0; x < diameter; x++) { for (pix = 0; pix < window; pix++) {
/* this is done separately now due to the correction for float /* this is done separately now due to the correction for float
radius values above */ radius values above */
sum += maskData[x]; sum += maskData[pix];
} }
for (i = 0; i < diameter; i++) { for (pix = 0; pix < window; pix++) {
maskData[i] *= (1.0 / sum); maskData[pix] *= (1.0 / sum);
// printf("%d %f\n", i, maskData[i]); // printf("%d %f\n", pix, maskData[pix]);
} }
// printf("\n"); // printf("\n");
@ -109,9 +105,9 @@ gblur(Imaging im, Imaging imOut, float floatRadius, int channels)
for (x = 0; x < im->xsize; x++) { for (x = 0; x < im->xsize; x++) {
/* for each neighbor pixel, factor in its value/weighting to the /* for each neighbor pixel, factor in its value/weighting to the
current pixel */ current pixel */
for (pix = 0; pix < diameter; pix++) { for (pix = 0; pix < window; pix++) {
/* figure the offset of this neighbor pixel */ /* figure the offset of this neighbor pixel */
offset = pix - radius; offset = pix - effectiveRadius;
if (x + offset < 0) if (x + offset < 0)
offset = -x; offset = -x;
else if (x + offset >= im->xsize) else if (x + offset >= im->xsize)
@ -146,9 +142,9 @@ gblur(Imaging im, Imaging imOut, float floatRadius, int channels)
newPixel[0] = newPixel[1] = newPixel[2] = newPixel[3] = 0; newPixel[0] = newPixel[1] = newPixel[2] = newPixel[3] = 0;
/* for each neighbor pixel, factor in its value/weighting to the /* for each neighbor pixel, factor in its value/weighting to the
current pixel */ current pixel */
for (pix = 0; pix < diameter; pix++) { for (pix = 0; pix < window; pix++) {
/* figure the offset of this neighbor pixel */ /* figure the offset of this neighbor pixel */
offset = pix - radius; offset = pix - effectiveRadius;
if (y + offset < 0) if (y + offset < 0)
offset = -y; offset = -y;
else if (y + offset >= im->ysize) else if (y + offset >= im->ysize)