Skip to content

GIMP
GIMP
Commit 61be6a53 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann
Browse files
Options

minor code cleanup. 

2005-06-08  Sven Neumann  <sven@gimp.org>

	* plug-ins/common/laplace.c: minor code cleanup.
parent 76d29142
Hide whitespace changes
Inline Side-by-side
Showing with 75 additions and 47 deletions
ChangeLog
View file @ 61be6a53
2005-06-08 Sven Neumann <sven@gimp.org>
* plug-ins/common/laplace.c: minor code cleanup.
2005-06-08 Sven Neumann <sven@gimp.org>
* app/config/gimprc-blurbs.h: removed blurbs for unused preferences.
......
plug-ins/common/laplace.c
View file @ 61be6a53
......@@ -16,21 +16,10 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* This plugin by thorsten@arch.usyd.edu.au */
/* Based on S&P's Gauss and Laplace filters */
/* updated 1/30/03: <sjburges@gimp.org>
* fixed an off-by-1 error that was causing an attempt to read a
* get_pixel_by_row at the -1'th row
/* This plugin by thorsten@arch.usyd.edu.au.
* Based on S&P's Gauss and Laplace filters.
*/
/* updated 11/04/97:
Use 8-pixel neighbourhood to create outline,
use min-max operation for local gradient,
don't use rint;
if gamma-channel: set to white if at least one colour channel is >15 */
#include "config.h"
#include <stdlib.h>
......@@ -42,19 +31,19 @@
/* Declare local functions.
*/
static void query (void);
static void run (const gchar *name,
gint nparams,
const GimpParam *param,
gint *nreturn_vals,
GimpParam **return_vals);
static void query (void);
static void run (const gchar *name,
gint nparams,
const GimpParam *param,
gint *nreturn_vals,
GimpParam **return_vals);
static void laplace (GimpDrawable *drawable);
static void laplace_prepare_row (GimpPixelRgn *pixel_rgn,
guchar *data,
gint x,
gint y,
gint w);
static void laplace (GimpDrawable *drawable);
static void laplace_prepare_row (GimpPixelRgn *pixel_rgn,
guchar *data,
gint x,
gint y,
gint w);
GimpPlugInInfo PLUG_IN_INFO =
......@@ -150,20 +139,27 @@ laplace_prepare_row (GimpPixelRgn *pixel_rgn,
gint y,
gint w)
{
gint bpp = pixel_rgn->bpp;
gint b;
if (y < 0)
{
gimp_pixel_rgn_get_row (pixel_rgn, data, x, (y + 1), w);
}
else if (y == pixel_rgn->h)
{
gimp_pixel_rgn_get_row (pixel_rgn, data, x, (y - 1), w);
}
else
{
gimp_pixel_rgn_get_row (pixel_rgn, data, x, y, w);
}
/* Fill in edge pixels */
for (b = 0; b < pixel_rgn->bpp; b++)
for (b = 0; b < bpp; b++)
{
data[-(int)pixel_rgn->bpp + b] = data[b];
data[w * pixel_rgn->bpp + b] = data[(w - 1) * pixel_rgn->bpp + b];
data[b - bpp] = data[b];
data[w * bpp + b] = data[(w - 1) * bpp + b];
}
}
......@@ -183,14 +179,37 @@ minmax (gint x1,
{
gint min1, min2, max1, max2;
if (x1 > x2) { max1=x1; min1=x2; } else { max1=x2; min1=x1; }
if (x3 > x4) { max2=x3; min2=x4; } else { max2=x4; min2=x3; }
if (x1 > x2)
{
max1 = x1;
min1 = x2;
}
else
{
max1 = x2;
min1 = x1;
}
if (x3 > x4)
{
max2 = x3;
min2 = x4;
}
else
{
max2 = x4;
min2 = x3;
}
if (min1 < min2)
*min_result = MIN (min1, x5);
else *min_result = MIN (min2, x5);
else
*min_result = MIN (min2, x5);
if (max1 > max2)
*max_result = MAX (max1, x5);
else *max_result = MAX (max2, x5);
else
*max_result = MAX (max2, x5);
}
static void
......@@ -265,12 +284,15 @@ laplace (GimpDrawable *drawable)
{
minmax (pr[col], cr[col - bytes], cr[col], cr[col + bytes],
nr[col], &minval, &maxval); /* four-neighbourhood */
gradient = (0.5 * MAX ((maxval - cr [col]), (cr[col]- minval)));
max_gradient = MAX (abs (gradient), max_gradient);
*d++ = ((pr[col - bytes] + pr[col] + pr[col + bytes] +
cr[col - bytes] - (8 * cr[col]) + cr[col + bytes] +
nr[col - bytes] + nr[col] + nr[col + bytes]) > 0) ?
gradient : (128 + gradient);
*d++ = (((pr[col - bytes] + pr[col] + pr[col + bytes] +
cr[col - bytes] - (8 * cr[col]) + cr[col + bytes] +
nr[col - bytes] + nr[col] + nr[col + bytes]) > 0) ?
gradient : (128 + gradient));
}
/* store the dest */
......@@ -313,17 +335,18 @@ laplace (GimpDrawable *drawable)
for (col = 0; col < (x2 - x1) * bytes; col++)
{
current = cr[col];
current = (WHITE_REGION(current) &&
(BLACK_REGION (pr[col - bytes]) ||
BLACK_REGION (pr[col]) ||
BLACK_REGION (pr[col + bytes]) ||
BLACK_REGION (cr[col - bytes]) ||
BLACK_REGION (cr[col + bytes]) ||
BLACK_REGION (nr[col - bytes]) ||
BLACK_REGION (nr[col]) ||
BLACK_REGION (nr[col + bytes]))) ?
(gint) (scale * ((float) ((current >= 128) ?
(current-128) : current))) : 0;
current = ((WHITE_REGION (current) &&
(BLACK_REGION (pr[col - bytes]) ||
BLACK_REGION (pr[col]) ||
BLACK_REGION (pr[col + bytes]) ||
BLACK_REGION (cr[col - bytes]) ||
BLACK_REGION (cr[col + bytes]) ||
BLACK_REGION (nr[col - bytes]) ||
BLACK_REGION (nr[col]) ||
BLACK_REGION (nr[col + bytes]))) ?
(gint) (scale * ((float) ((current >= 128) ?
(current - 128) : current)))
: 0);
if (alpha && (((col + 1) % bytes) == 0)) /* the alpha channel */
{
......@@ -333,6 +356,7 @@ laplace (GimpDrawable *drawable)
else
{
*d++ = current;
if (current > 15)
counter ++;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment