dallasgroot/Gimp
dallasgroot/Gimp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

indentation and whitespace cleanup.

Browse source 
2004-09-07  Michael Natterer  <mitch@gimp.org>

	* plug-ins/common/edge.c: indentation and whitespace cleanup.

	* plug-ins/common/struc.c: minor coding style issues.
This commit is contained in:
Michael Natterer 2004-09-07 12:13:29 +00:00 committed by Michael Natterer
parent 6d86a4da42
commit a2a6572519
3 changed files with 65 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2004-09-07 Michael Natterer <mitch@gimp.org>
* plug-ins/common/edge.c: indentation and whitespace cleanup.
* plug-ins/common/struc.c: minor coding style issues.
2004-09-07 Michael Natterer <mitch@gimp.org>
* plug-ins/common/xwd.c (query): applied patch from Alan Horkan

80
plug-ins/common/edge.c
View file

@ -24,9 +24,9 @@
*/
/* pgmedge.c - edge-detect a portable graymap
**
** Copyright (C) 1989 by Jef Poskanzer.
*/
*
* Copyright (C) 1989 by Jef Poskanzer.
*/
/*
* Ported to GIMP Plug-in API 1.0
@ -50,7 +50,6 @@
#include "config.h"
#include <math.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@ -280,7 +279,9 @@ edge (GimpDrawable *drawable)
guchar pix10[4], pix11[4], pix12[4];
guchar pix20[4], pix21[4], pix22[4];
glong width, height;
gint alpha, has_alpha, chan;
gint alpha;
gboolean has_alpha;
gint chan;
gint x, y;
gint x1, y1, x2, y2;
gint maxval;
@ -295,9 +296,9 @@ edge (GimpDrawable *drawable)
gimp_drawable_mask_bounds (drawable->drawable_id, &x1, &y1, &x2, &y2);
width = gimp_drawable_width (drawable->drawable_id);
height = gimp_drawable_height (drawable->drawable_id);
alpha = gimp_drawable_bpp (drawable->drawable_id);
width = gimp_drawable_width (drawable->drawable_id);
height = gimp_drawable_height (drawable->drawable_id);
alpha = gimp_drawable_bpp (drawable->drawable_id);
has_alpha = gimp_drawable_has_alpha (drawable->drawable_id);
if (has_alpha)
alpha--;
@ -332,9 +333,9 @@ edge (GimpDrawable *drawable)
dest_rgn.y < y && y < dest_rgn.y + dest_rgn.h - 2)
{
/*
** 3x3 kernel is inside of the tile -- do fast
** version
*/
* 3x3 kernel is inside of the tile -- do fast
* version
*/
for (chan = 0; chan < alpha; chan++)
{
/* get the 3x3 kernel into a guchar array,
@ -350,15 +351,15 @@ edge (GimpDrawable *drawable)
#undef PIX
dest[chan] = edge_detect(kernel);
dest[chan] = edge_detect (kernel);
}
}
else
{
/*
** The kernel is not inside of the tile -- do slow
** version
*/
* The kernel is not inside of the tile -- do slow
* version
*/
gimp_pixel_fetcher_get_pixel (pft, x-1, y-1, pix00);
gimp_pixel_fetcher_get_pixel (pft, x , y-1, pix10);
@ -413,30 +414,32 @@ static gint
edge_detect (const guchar *data)
{
gint ret;
switch (evals.edgemode)
{
case SOBEL:
ret = sobel (data);
break;
case PREWITT:
ret = prewitt (data);
break;
case GRADIENT:
ret = gradient (data);
break;
case ROBERTS:
ret = roberts (data);
break;
case DIFFERENTIAL:
ret = differential (data);
break;
case LAPLACE:
ret = laplace (data);
break;
default:
ret = -1;
break;
case SOBEL:
ret = sobel (data);
break;
case PREWITT:
ret = prewitt (data);
break;
case GRADIENT:
ret = gradient (data);
break;
case ROBERTS:
ret = roberts (data);
break;
case DIFFERENTIAL:
ret = differential (data);
break;
case LAPLACE:
ret = laplace (data);
break;
default:
ret = -1;
break;
}
return CLAMP0255 (ret);
}
@ -699,7 +702,7 @@ edge_dialog (GimpDrawable *drawable)
scale_data = gimp_scale_entry_new (GTK_TABLE (table), 0, 1,
_("A_mount:"), 100, 0,
evals.amount, 1.0, 10.0, 0.1, 1.0, 1,
TRUE, 0, 0,
FALSE, 1.0, G_MAXFLOAT,
NULL, NULL);
g_signal_connect (scale_data, "value_changed",
@ -921,7 +924,7 @@ edge_preview_update (GimpDrawable *drawable)
kernel[7] = SRC(x+1, y );
kernel[8] = SRC(x+1, y+1);
#undef SRC
dest[chan] = edge_detect(kernel);
dest[chan] = edge_detect (kernel);
}
if (has_alpha)
dest[alpha] = src[bytes * (x + preview_width * y) + alpha];
@ -939,4 +942,3 @@ edge_preview_update (GimpDrawable *drawable)
g_free (render_buffer);
g_free (src);
}

29
plug-ins/common/struc.c
View file

@ -1283,8 +1283,10 @@ struc_dialog (GimpDrawable *drawable)
preview = gimp_drawable_preview_new (drawable, &svals.update_preview);
gtk_box_pack_start (GTK_BOX (hbox), preview, FALSE, FALSE, 0);
gtk_widget_show (preview);
g_signal_connect_swapped (preview, "invalidated",
G_CALLBACK (strucpi), drawable);
G_CALLBACK (strucpi),
drawable);
frame = gimp_int_radio_group_new (TRUE, _("Direction"),
G_CALLBACK (gimp_radio_button_update),
@ -1296,18 +1298,22 @@ struc_dialog (GimpDrawable *drawable)
_("Bottom-_right"), BOTTOM_RIGHT, &radio4,
NULL);
g_signal_connect_swapped (radio1, "toggled",
G_CALLBACK (gimp_preview_invalidate), preview);
g_signal_connect_swapped (radio2, "toggled",
G_CALLBACK (gimp_preview_invalidate), preview);
g_signal_connect_swapped (radio3, "toggled",
G_CALLBACK (gimp_preview_invalidate), preview);
g_signal_connect_swapped (radio4, "toggled",
G_CALLBACK (gimp_preview_invalidate), preview);
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
g_signal_connect_swapped (radio1, "toggled",
G_CALLBACK (gimp_preview_invalidate),
preview);
g_signal_connect_swapped (radio2, "toggled",
G_CALLBACK (gimp_preview_invalidate),
preview);
g_signal_connect_swapped (radio3, "toggled",
G_CALLBACK (gimp_preview_invalidate),
preview);
g_signal_connect_swapped (radio4, "toggled",
G_CALLBACK (gimp_preview_invalidate),
preview);
table = gtk_table_new (1, 3, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (table), 6);
gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0);
@ -1322,7 +1328,8 @@ struc_dialog (GimpDrawable *drawable)
G_CALLBACK (gimp_int_adjustment_update),
&svals.depth);
g_signal_connect_swapped (adj, "value_changed",
G_CALLBACK (gimp_preview_invalidate), preview);
G_CALLBACK (gimp_preview_invalidate),
preview);
gtk_widget_show (dlg);