dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Code clean-up for several plug-ins.

This commit is contained in:
Maurits Rijk 2002-12-15 20:31:07 +00:00
parent 9a7409afd6
commit 6776254b59
7 changed files with 220 additions and 962 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2002-12-15 Maurits Rijk <lpeek.mrijk@consunet.nl>
* plug-ins/common/displace.c
* plug-ins/common/ripple.c
* plug-ins/common/shift.c
* plug-ins/common/spread.c
* plug-ins/common/tileit.c
* plug-ins/common/noisify.c: code clean-up, fixed memory leak,
better use of libgimp routines.
2002-12-15 Sven Neumann <sven@gimp.org>
* app/gui/user-install-dialog.c: set text and base colors as well

138
plug-ins/common/displace.c
View File

@ -58,10 +58,6 @@
#define ENTRY_WIDTH 75
#define TILE_CACHE_SIZE 48
#define WRAP 0
#define SMEAR 1
#define BLACK 2
typedef struct
{
gdouble amount_x;
@ -91,19 +87,6 @@ static void run (gchar *name,
static void displace (GimpDrawable *drawable);
static gint displace_dialog (GimpDrawable *drawable);
static GimpTile *displace_pixel (GimpDrawable *drawable,
GimpTile *tile,
gint width,
gint height,
gint x1,
gint y1,
gint x2,
gint y2,
gint x,
gint y,
gint *row,
gint *col,
guchar *pixel);
static gint displace_map_constrain (gint32 image_id,
gint32 drawable_id,
@ -136,7 +119,7 @@ static DisplaceVals dvals =
TRUE, /* do_y */
-1, /* displace_map_x */
-1, /* displace_map_y */
WRAP /* displace_type */
PIXEL_WRAP /* displace_type */
};
static DisplaceInterface dint =
@ -409,13 +392,13 @@ displace_dialog (GimpDrawable *drawable)
gtk_widget_show (toggle);
g_object_set_data (G_OBJECT (toggle), "gimp-item-data",
GINT_TO_POINTER (WRAP));
GINT_TO_POINTER (PIXEL_WRAP));
g_signal_connect (G_OBJECT (toggle), "toggled",
G_CALLBACK (gimp_radio_button_update),
&dvals.displace_type);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle),
dvals.displace_type == WRAP);
dvals.displace_type == PIXEL_WRAP);
toggle = gtk_radio_button_new_with_mnemonic (group, _("_Smear"));
group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (toggle));
@ -423,13 +406,13 @@ displace_dialog (GimpDrawable *drawable)
gtk_widget_show (toggle);
g_object_set_data (G_OBJECT (toggle), "gimp-item-data",
GINT_TO_POINTER (SMEAR));
GINT_TO_POINTER (PIXEL_SMEAR));
g_signal_connect (G_OBJECT (toggle), "toggled",
G_CALLBACK (gimp_radio_button_update),
&dvals.displace_type);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle),
dvals.displace_type == SMEAR);
dvals.displace_type == PIXEL_SMEAR);
toggle = gtk_radio_button_new_with_mnemonic (group, _("_Black"));
group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (toggle));
@ -437,13 +420,13 @@ displace_dialog (GimpDrawable *drawable)
gtk_widget_show (toggle);
g_object_set_data (G_OBJECT (toggle), "gimp-item-data",
GINT_TO_POINTER (BLACK));
GINT_TO_POINTER (PIXEL_BLACK));
g_signal_connect (G_OBJECT (toggle), "toggled",
G_CALLBACK (gimp_radio_button_update),
&dvals.displace_type);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle),
dvals.displace_type == BLACK);
dvals.displace_type == PIXEL_BLACK);
gtk_widget_show (toggle_hbox);
gtk_widget_show (table);
@ -466,10 +449,8 @@ displace (GimpDrawable *drawable)
GimpPixelRgn dest_rgn;
GimpPixelRgn map_x_rgn;
GimpPixelRgn map_y_rgn;
GimpTile * tile = NULL;
gint row = -1;
gint col = -1;
gpointer pr;
GimpPixelFetcher *pft;
gint width;
gint height;
@ -502,7 +483,8 @@ displace (GimpDrawable *drawable)
mxrow = NULL;
myrow = NULL;
/* Get selection area */
pft = gimp_pixel_fetcher_new (drawable);
gimp_drawable_mask_bounds (drawable->drawable_id, &x1, &y1, &x2, &y2);
width = drawable->width;
@ -600,19 +582,23 @@ displace (GimpDrawable *drawable)
/* Calculations complete; now copy the proper pixel */
if (needx >= 0.0)
xi = (int) needx;
xi = (int) needx;
else
xi = -((int) -needx + 1);
xi = -((int) -needx + 1);
if (needy >= 0.0)
yi = (int) needy;
yi = (int) needy;
else
yi = -((int) -needy + 1);
yi = -((int) -needy + 1);
tile = displace_pixel (drawable, tile, width, height, x1, y1, x2, y2, xi, yi, &row, &col, pixel[0]);
tile = displace_pixel (drawable, tile, width, height, x1, y1, x2, y2, xi + 1, yi, &row, &col, pixel[1]);
tile = displace_pixel (drawable, tile, width, height, x1, y1, x2, y2, xi, yi + 1, &row, &col, pixel[2]);
tile = displace_pixel (drawable, tile, width, height, x1, y1, x2, y2, xi + 1, yi + 1, &row, &col, pixel[3]);
gimp_pixel_fetcher_get_pixel2 (pft, xi, yi,
dvals.displace_type, pixel[0]);
gimp_pixel_fetcher_get_pixel2 (pft, xi + 1, yi,
dvals.displace_type, pixel[1]);
gimp_pixel_fetcher_get_pixel2 (pft, xi, yi + 1,
dvals.displace_type, pixel[2]);
gimp_pixel_fetcher_get_pixel2 (pft, xi + 1, yi + 1,
dvals.displace_type, pixel[3]);
for (k = 0; k < bytes; k++)
{
@ -638,8 +624,7 @@ displace (GimpDrawable *drawable)
gimp_progress_update ((double) progress / (double) max_progress);
} /* for */
if (tile)
gimp_tile_unref (tile, FALSE);
gimp_pixel_fetcher_destroy (pft);
/* detach from the map drawables */
if (dvals.do_x)
@ -651,8 +636,7 @@ displace (GimpDrawable *drawable)
gimp_drawable_flush (drawable);
gimp_drawable_merge_shadow (drawable->drawable_id, TRUE);
gimp_drawable_update (drawable->drawable_id, x1, y1, (x2 - x1), (y2 - y1));
} /* displace */
}
static gdouble
displace_map_give_value (guchar *pt,
@ -670,79 +654,9 @@ displace_map_give_value (guchar *pt,
{
val_alpha = pt[bytes - 1];
ret = ((ret - 127.5) * val_alpha / 255.0) + 127.5;
};
}
return (ret);
}
static GimpTile *
displace_pixel (GimpDrawable *drawable,
GimpTile *tile,
gint width,
gint height,
gint x1,
gint y1,
gint x2,
gint y2,
gint x,
gint y,
gint *row,
gint *col,
guchar *pixel)
{
static guchar empty_pixel[4] = {0, 0, 0, 0};
guchar *data;
gint b;
/* Tile the image. */
if (dvals.displace_type == WRAP)
{
if (x < 0)
x = width - (-x % width);
else
x %= width;
if (y < 0)
y = height - (-y % height);
else
y %= height;
}
/* Smear out the edges of the image by repeating pixels. */
else if (dvals.displace_type == SMEAR)
{
if (x < 0)
x = 0;
else if (x > width - 1)
x = width - 1;
if (y < 0)
y = 0;
else if (y > height - 1)
y = height - 1;
}
if (x >= x1 && y >= y1 && x < x2 && y < y2)
{
if ((x >> 6 != *col) || (y >> 6 != *row))
{
*col = x / 64;
*row = y / 64;
if (tile)
gimp_tile_unref (tile, FALSE);
tile = gimp_drawable_get_tile (drawable, FALSE, *row, *col);
gimp_tile_ref (tile);
}
data = tile->data + tile->bpp * (tile->ewidth * (y % 64) + (x % 64));
}
else
data = empty_pixel;
for (b = 0; b < drawable->bpp; b++)
pixel[b] = data[b];
return tile;
return ret;
}
/* Displace interface functions */

509
plug-ins/common/noisify.c
View File

@ -37,12 +37,6 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <time.h>
#ifdef __GNUC__
#warning GTK_DISABLE_DEPRECATED
#endif
#undef GTK_DISABLE_DEPRECATED
#include <gtk/gtk.h>
@ -54,7 +48,6 @@
#define SCALE_WIDTH 125
#define TILE_CACHE_SIZE 16
#define PREVIEW_SIZE 128
typedef struct
{
@ -82,10 +75,6 @@ static void noisify (GimpDrawable *drawable,
gboolean preview_mode);
static gdouble gauss (GRand *gr);
static void fill_preview (GtkWidget *preview_widget,
GimpDrawable *drawable);
static GtkWidget *preview_widget (GimpDrawable *drawable);
static gint noisify_dialog (GimpDrawable *drawable,
gint channels);
static void noisify_ok_callback (GtkWidget *widget,
@ -114,11 +103,8 @@ static NoisifyInterface noise_int =
FALSE /* run */
};
static GtkWidget *preview;
static guchar *preview_cache;
static gint preview_cache_rowstride;
static gint preview_cache_bpp;
static GimpRunMode run_mode;
static GimpFixMePreview *preview;
MAIN ()
@ -159,7 +145,6 @@ run (gchar *name,
{
static GimpParam values[1];
GimpDrawable *drawable;
GimpRunMode run_mode;
GimpPDBStatusType status = GIMP_PDB_SUCCESS;
run_mode = param[0].data.d_int32;
@ -231,7 +216,6 @@ run (gchar *name,
/* Store data */
if (run_mode == GIMP_RUN_INTERACTIVE) {
gimp_set_data ("plug_in_noisify", &nvals, sizeof (NoisifyVals));
g_free(preview_cache);
}
}
else
@ -245,75 +229,26 @@ run (gchar *name,
gimp_drawable_detach (drawable);
}
static void
preview_do_row(gint row,
gint width,
guchar *even,
guchar *odd,
guchar *src)
static void
noisify_func (guchar *src, guchar *dest, gint bpp, GRand *gr)
{
gint x;
gint noise = 0, b;
if (!nvals.independent)
noise = (gint) (nvals.noise[0] * gauss (gr) * 127);
guchar *p0 = even;
guchar *p1 = odd;
gdouble r, g, b, a;
gdouble c0, c1;
for (x = 0; x < width; x++)
for (b = 0; b < bpp; b++)
{
if (preview_cache_bpp == 4)
if (nvals.noise[b] > 0.0)
{
r = ((gdouble)src[x*4+0]) / 255.0;
g = ((gdouble)src[x*4+1]) / 255.0;
b = ((gdouble)src[x*4+2]) / 255.0;
a = ((gdouble)src[x*4+3]) / 255.0;
}
else if (preview_cache_bpp == 3)
{
r = ((gdouble)src[x*3+0]) / 255.0;
g = ((gdouble)src[x*3+1]) / 255.0;
b = ((gdouble)src[x*3+2]) / 255.0;
a = 1.0;
if (nvals.independent)
noise = (gint) (nvals.noise[b] * gauss (gr) * 127);
gint p = src[b] + noise;
dest[b] = CLAMP0255(p);
}
else
{
r = ((gdouble)src[x*preview_cache_bpp+0]) / 255.0;
g = b = r;
if (preview_cache_bpp == 2)
a = ((gdouble)src[x*preview_cache_bpp+1]) / 255.0;
else
a = 1.0;
}
if ((x / GIMP_CHECK_SIZE) & 1)
{
c0 = GIMP_CHECK_LIGHT;
c1 = GIMP_CHECK_DARK;
}
else
{
c0 = GIMP_CHECK_DARK;
c1 = GIMP_CHECK_LIGHT;
}
*p0++ = (c0 + (r - c0) * a) * 255.0;
*p0++ = (c0 + (g - c0) * a) * 255.0;
*p0++ = (c0 + (b - c0) * a) * 255.0;
*p1++ = (c1 + (r - c1) * a) * 255.0;
*p1++ = (c1 + (g - c1) * a) * 255.0;
*p1++ = (c1 + (b - c1) * a) * 255.0;
} /* for */
if ((row / GIMP_CHECK_SIZE) & 1)
{
gtk_preview_draw_row (GTK_PREVIEW (preview), (guchar *)odd, 0, row, width);
}
else
{
gtk_preview_draw_row (GTK_PREVIEW (preview), (guchar *)even, 0, row, width);
dest[b] = src[b];
}
}
@ -321,155 +256,72 @@ static void
noisify (GimpDrawable *drawable,
gboolean preview_mode)
{
GimpPixelRgn src_rgn, dest_rgn;
guchar *src_row, *dest_row;
guchar *src, *dest, *dest_data;
gint row, col, b;
gint x1, y1, x2, y2, p, bpp = 3;
gint noise;
gint progress = 0, max_progress = 0;
gpointer pr;
gint row_stride = 0;
guchar *odd = NULL;
guchar *even = NULL;
GRand *gr;
/* initialize */
noise = 0;
gr = g_rand_new ();
if (preview_mode)
{
x1 = y1 = 0;
x2 = GTK_PREVIEW (preview)->buffer_width;
y2 = GTK_PREVIEW (preview)->buffer_height;
bpp = preview_cache_bpp;
row_stride = preview_cache_rowstride;
even = g_malloc (x2 * 3);
odd = g_malloc (x2 * 3);
}
else
{
gimp_drawable_mask_bounds (drawable->drawable_id, &x1, &y1, &x2, &y2);
gimp_pixel_rgn_init (&src_rgn, drawable,
x1, y1, (x2 - x1), (y2 - y1), FALSE, FALSE);
gimp_pixel_rgn_init (&dest_rgn, drawable,
x1, y1, (x2 - x1), (y2 - y1), TRUE, TRUE);
/* Initialize progress */
progress = 0;
max_progress = (x2 - x1) * (y2 - y1);
}
guchar *src, *dest, *dest_data;
gint width, height, row_stride;
gint row, col;
gint bpp;
if (preview_mode)
{
dest_data = g_malloc (row_stride * y2);
width = preview->width;
height = preview->height;
bpp = preview->bpp;
row_stride = preview->rowstride;
for (row = 0; row < y2; row++)
dest_data = g_malloc (row_stride);
for (row = 0; row < height; row++)
{
src = preview_cache + row * row_stride;
dest = dest_data + row * row_stride;
for (col = 0; col < x2; col++)
src = preview->cache + row * row_stride;
dest = dest_data;
for (col = 0; col < width; col++)
{
if (nvals.independent == FALSE)
noise = (gint) (nvals.noise[0] * gauss (gr) * 127);
for (b = 0; b < bpp; b++)
{
if (nvals.independent == TRUE)
noise = (gint) (nvals.noise[b] * gauss (gr) * 127);
if (nvals.noise[b] > 0.0)
{
p = src[b] + noise;
if (p < 0)
p = 0;
else if (p > 255)
p = 255;
dest[b] = p;
}
else
dest[b] = src[b];
}
noisify_func (src, dest, bpp, gr);
src += bpp;
dest += bpp;
}
gimp_fixme_preview_do_row(preview, row, width, dest_data);
}
for (row = 0; row < y2; row++)
{
preview_do_row(row,x2,even,odd,dest_data + row * row_stride);
}
gtk_widget_queue_draw (preview);
g_free(even);
g_free(odd);
g_free (dest_data);
gtk_widget_queue_draw (preview->widget);
}
else
{
for (pr = gimp_pixel_rgns_register (2, &src_rgn, &dest_rgn);
pr != NULL;
pr = gimp_pixel_rgns_process (pr))
{
src_row = src_rgn.data;
dest_row = dest_rgn.data;
for (row = 0; row < src_rgn.h; row++)
{
src = src_row;
dest = dest_row;
for (col = 0; col < src_rgn.w; col++)
{
if (nvals.independent == FALSE)
noise = (gint) (nvals.noise[0] * gauss (gr) * 127);
for (b = 0; b < src_rgn.bpp; b++)
{
if (nvals.independent == TRUE)
noise = (gint) (nvals.noise[b] * gauss (gr) * 127);
if (nvals.noise[b] > 0.0)
{
p = src[b] + noise;
if (p < 0)
p = 0;
else if (p > 255)
p = 255;
dest[b] = p;
}
else
dest[b] = src[b];
}
src += src_rgn.bpp;
dest += dest_rgn.bpp;
}
src_row += src_rgn.rowstride;
dest_row += dest_rgn.rowstride;
}
/* Update progress */
progress += src_rgn.w * src_rgn.h;
gimp_progress_update ((double) progress / (double) max_progress);
}
/* update the blurred region */
gimp_drawable_flush (drawable);
gimp_drawable_merge_shadow (drawable->drawable_id, TRUE);
gimp_drawable_update (drawable->drawable_id, x1, y1, (x2 - x1), (y2 - y1));
} /* endif normal mode */
gimp_rgn_iterate2 (drawable, run_mode, (GimpRgnFunc2) noisify_func, gr);
}
g_rand_free (gr);
}
static void
noisify_add_channel (GtkWidget *table, gint channel, gchar *name,
GimpDrawable *drawable)
{
GtkObject *adj;
adj = gimp_scale_entry_new (GTK_TABLE (table), 0, channel + 1,
name, SCALE_WIDTH, 0,
nvals.noise[channel], 0.0, 1.0, 0.01, 0.1, 2,
TRUE, 0, 0,
NULL, NULL);
g_object_set_data (G_OBJECT (adj), "drawable", drawable);
g_signal_connect (G_OBJECT (adj), "value_changed",
G_CALLBACK (noisify_double_adjustment_update),
&nvals.noise[channel]);
noise_int.channel_adj[channel] = adj;
}
static gint
noisify_dialog (GimpDrawable *drawable,
gint channels)
@ -480,9 +332,6 @@ noisify_dialog (GimpDrawable *drawable,
GtkWidget *toggle;
GtkWidget *frame;
GtkWidget *table;
GtkObject *adj;
gchar *buffer;
gint i;
gimp_ui_init ("noisify", FALSE);
@ -520,10 +369,11 @@ noisify_dialog (GimpDrawable *drawable,
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
gtk_container_add (GTK_CONTAINER (abox), frame);
gtk_widget_show (frame);
preview = preview_widget (drawable);
gtk_container_add (GTK_CONTAINER (frame), preview);
preview = gimp_fixme_preview_new (NULL);
gimp_fixme_preview_fill (preview, drawable);
gtk_container_add (GTK_CONTAINER (frame), preview->widget);
noisify (drawable, TRUE); /* preview noisify */
gtk_widget_show (preview);
gtk_widget_show (preview->widget);
/* parameter settings */
frame = gtk_frame_new (_("Parameter Settings"));
@ -551,173 +401,37 @@ noisify_dialog (GimpDrawable *drawable,
if (channels == 1)
{
adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 1,
_("_Gray:"), SCALE_WIDTH, 0,
nvals.noise[0], 0.0, 1.0, 0.01, 0.1, 2,
TRUE, 0, 0,
NULL, NULL);
g_object_set_data (G_OBJECT (adj), "drawable", drawable);
g_signal_connect (G_OBJECT (adj), "value_changed",
G_CALLBACK (noisify_double_adjustment_update),
&nvals.noise[0]);
noise_int.channel_adj[0] = adj;
noisify_add_channel (table, 0, _("_Gray:"), drawable);
}
else if (channels == 2)
{
adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 1,
_("_Gray:"), SCALE_WIDTH, 0,
nvals.noise[0], 0.0, 1.0, 0.01, 0.1, 2,
TRUE, 0, 0,
NULL, NULL);
g_object_set_data (G_OBJECT (adj), "drawable", drawable);
g_signal_connect (G_OBJECT (adj), "value_changed",
G_CALLBACK (noisify_double_adjustment_update),
&nvals.noise[0]);
noise_int.channel_adj[0] = adj;
adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 2,
_("_Alpha:"), SCALE_WIDTH, 0,
nvals.noise[1], 0.0, 1.0, 0.01, 0.1, 2,
TRUE, 0, 0,
NULL, NULL);
g_object_set_data (G_OBJECT (adj), "drawable", drawable);
g_signal_connect (G_OBJECT (adj), "value_changed",
G_CALLBACK (noisify_double_adjustment_update),
&nvals.noise[1]);
noise_int.channel_adj[1] = adj;
}
noisify_add_channel (table, 0, _("_Gray:"), drawable);
noisify_add_channel (table, 1, _("_Alpha:"), drawable);
}
else if (channels == 3)
{
adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 1,
_("_Red:"), SCALE_WIDTH, 0,
nvals.noise[0], 0.0, 1.0, 0.01, 0.1, 2,
TRUE, 0, 0,
NULL, NULL);
g_object_set_data (G_OBJECT (adj), "drawable", drawable);
g_signal_connect (G_OBJECT (adj), "value_changed",
G_CALLBACK (noisify_double_adjustment_update),
&nvals.noise[0]);
noise_int.channel_adj[0] = adj;
adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 2,
_("_Green:"), SCALE_WIDTH, 0,
nvals.noise[1], 0.0, 1.0, 0.01, 0.1, 2,
TRUE, 0, 0,
NULL, NULL);
g_object_set_data (G_OBJECT (adj), "drawable", drawable);
g_signal_connect (G_OBJECT (adj), "value_changed",
G_CALLBACK (noisify_double_adjustment_update),
&nvals.noise[1]);
noise_int.channel_adj[1] = adj;
adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 3,
_("_Blue:"), SCALE_WIDTH, 0,
nvals.noise[2], 0.0, 1.0, 0.01, 0.1, 2,
TRUE, 0, 0,
NULL, NULL);
g_object_set_data (G_OBJECT (adj), "drawable", drawable);
g_signal_connect (G_OBJECT (adj), "value_changed",
G_CALLBACK (noisify_double_adjustment_update),
&nvals.noise[2]);
noise_int.channel_adj[2] = adj;
noisify_add_channel (table, 0, _("_Red:"), drawable);
noisify_add_channel (table, 1, _("_Green:"), drawable);
noisify_add_channel (table, 2, _("_Blue:"), drawable);
}
else if (channels == 4)
{
adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 1,
_("_Red:"), SCALE_WIDTH, 0,
nvals.noise[0], 0.0, 1.0, 0.01, 0.1, 2,
TRUE, 0, 0,
NULL, NULL);
g_object_set_data (G_OBJECT (adj), "drawable", drawable);
g_signal_connect (G_OBJECT (adj), "value_changed",
G_CALLBACK (noisify_double_adjustment_update),
&nvals.noise[0]);
noise_int.channel_adj[0] = adj;
adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 2,
_("_Green:"), SCALE_WIDTH, 0,
nvals.noise[1], 0.0, 1.0, 0.01, 0.1, 2,
TRUE, 0, 0,
NULL, NULL);
g_object_set_data (G_OBJECT (adj), "drawable", drawable);
g_signal_connect (G_OBJECT (adj), "value_changed",
G_CALLBACK (noisify_double_adjustment_update),
&nvals.noise[1]);
noise_int.channel_adj[1] = adj;
adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 3,
_("_Blue:"), SCALE_WIDTH, 0,
nvals.noise[2], 0.0, 1.0, 0.01, 0.1, 2,
TRUE, 0, 0,
NULL, NULL);
g_object_set_data (G_OBJECT (adj), "drawable", drawable);
g_signal_connect (G_OBJECT (adj), "value_changed",
G_CALLBACK (noisify_double_adjustment_update),
&nvals.noise[2]);
noise_int.channel_adj[2] = adj;
adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 4,
_("_Alpha:"), SCALE_WIDTH, 0,
nvals.noise[3], 0.0, 1.0, 0.01, 0.1, 2,
TRUE, 0, 0,
NULL, NULL);
g_object_set_data (G_OBJECT (adj), "drawable", drawable);
g_signal_connect (G_OBJECT (adj), "value_changed",
G_CALLBACK (noisify_double_adjustment_update),
&nvals.noise[3]);
noise_int.channel_adj[3] = adj;
noisify_add_channel (table, 0, _("_Red:"), drawable);
noisify_add_channel (table, 1, _("_Green:"), drawable);
noisify_add_channel (table, 2, _("_Blue:"), drawable);
noisify_add_channel (table, 3, _("_Alpha:"), drawable);
}
else
{
gchar *buffer;
gint i;
for (i = 0; i < channels; i++)
{
buffer = g_strdup_printf (_("Channel #%d:"), i);
adj = gimp_scale_entry_new (GTK_TABLE (table), 0, i + 1,
buffer, SCALE_WIDTH, 0,
nvals.noise[i], 0.0, 1.0, 0.01, 0.1, 2,
TRUE, 0, 0,
NULL, NULL);
g_object_set_data (G_OBJECT (adj), "drawable", drawable);
g_signal_connect (G_OBJECT (adj), "value_changed",
G_CALLBACK (noisify_double_adjustment_update),
&nvals.noise[i]);
noise_int.channel_adj[i] = adj;
noisify_add_channel (table, i, buffer, drawable);
g_free (buffer);
}
@ -788,70 +502,3 @@ noisify_double_adjustment_update (GtkAdjustment *adjustment,
adjustment->value);
}
}
static GtkWidget *
preview_widget (GimpDrawable *drawable)
{
gint size;
preview = gtk_preview_new (GTK_PREVIEW_COLOR);
fill_preview (preview, drawable);
size = GTK_PREVIEW (preview)->rowstride * GTK_PREVIEW (preview)->buffer_height;
return preview;
}
static void
fill_preview (GtkWidget *widget,
GimpDrawable *drawable)
{
GimpPixelRgn srcPR;
gint width;
gint height;
gint x1, x2, y1, y2;
gint bpp;
gint y;
guchar *src;
guchar *even, *odd;
gimp_drawable_mask_bounds (drawable->drawable_id, &x1, &y1, &x2, &y2);
if (x2 - x1 > PREVIEW_SIZE)
x2 = x1 + PREVIEW_SIZE;
if (y2 - y1 > PREVIEW_SIZE)
y2 = y1 + PREVIEW_SIZE;
width = x2 - x1;
height = y2 - y1;
bpp = gimp_drawable_bpp (drawable->drawable_id);
if (width < 1 || height < 1)
return;
gtk_preview_size (GTK_PREVIEW (widget), width, height);
gimp_pixel_rgn_init (&srcPR, drawable, x1, y1, x2, y2, FALSE, FALSE);
even = g_malloc (width * 3);
odd = g_malloc (width * 3);
src = g_malloc (width * bpp);
preview_cache = g_malloc(width * bpp * height);
preview_cache_rowstride = width * bpp;
preview_cache_bpp = bpp;
for (y = 0; y < height; y++)
{
gimp_pixel_rgn_get_row (&srcPR, src, x1, y + y1, width);
memcpy(preview_cache + (y*width*bpp),src,width*bpp);
}
for (y = 0; y < height; y++)
{
preview_do_row(y,width,even,odd,preview_cache + (y*width*bpp));
}
g_free (even);
g_free (odd);
g_free (src);
}

209
plug-ins/common/ripple.c
View File

@ -22,7 +22,6 @@
*/
#include "config.h"
#include <time.h>
#include <stdio.h>
#include <stdlib.h>
@ -80,19 +79,6 @@ static gint ripple_dialog (void);
static void ripple_ok_callback (GtkWidget *widget,
gpointer data);
static GimpTile * ripple_pixel (GimpDrawable *drawable,
GimpTile *tile,
gint x1,
gint y1,
gint x2,
gint y2,
gint x,
gint y,
gint *row,
gint *col,
guchar *pixel);
static gdouble displace_amount (gint location);
static guchar averagetwo (gdouble location,
guchar *v);
@ -263,11 +249,8 @@ static void
ripple (GimpDrawable *drawable)
{
GimpPixelRgn dest_rgn;
GimpTile * tile = NULL;
gint row = -1;
gint col = -1;
gpointer pr;
GimpPixelFetcher *pft;
gint width, height;
gint bytes;
guchar *destline;
@ -280,13 +263,11 @@ ripple (GimpDrawable *drawable)
gdouble needx, needy;
guchar values[4];
guchar val;
gint xi, yi;
gint k;
/* Get selection area */
pft = gimp_pixel_fetcher_new (drawable);
gimp_drawable_mask_bounds (drawable->drawable_id, &x1, &y1, &x2, &y2);
@ -326,7 +307,7 @@ ripple (GimpDrawable *drawable)
{
dest = destline;
for (y = dest_rgn.y; y < (dest_rgn.y + dest_rgn.h); y++)
for (y = dest_rgn.y; y < dest_rgn.y + dest_rgn.h; y++)
{
otherdest = dest;
@ -342,65 +323,43 @@ ripple (GimpDrawable *drawable)
/* Smear out the edges of the image by repeating pixels. */
else if (rvals.edges == SMEAR)
{
if (yi < 0)
yi = 0;
else if (yi > height - 1)
yi = height - 1;
yi = CLAMP(yi, 0, height - 1);
}
if ( rvals.antialias)
if (rvals.antialias)
{
if (yi == height - 1)
{
tile = ripple_pixel (drawable, tile,
x1, y1, x2, y2,
x, yi, &row, &col, pixel[0]);
for (k = 0; k < bytes; k++)
*otherdest++ = pixel[0][k];
gimp_pixel_fetcher_get_pixel (pft, x, yi, otherdest);
otherdest += bytes;
}
else if (needy < 0 && needy > -1)
{
tile = ripple_pixel (drawable, tile,
x1, y1, x2, y2,
x, 0, &row, &col, pixel[0]);
for (k = 0; k < bytes; k++)
*otherdest++ = pixel[0][k];
gimp_pixel_fetcher_get_pixel (pft, x, 0, otherdest);
otherdest += bytes;
}
else if (yi == height - 2 || yi == 0)
{
tile = ripple_pixel (drawable, tile,
x1, y1, x2, y2,
x, yi, &row, &col, pixel[0]);
tile = ripple_pixel (drawable, tile,
x1, y1, x2, y2,
x, yi + 1, &row, &col, pixel[1]);
gimp_pixel_fetcher_get_pixel (pft, x, yi, pixel[0]);
gimp_pixel_fetcher_get_pixel (pft, x, yi + 1,
pixel[1]);
for (k = 0; k < bytes; k++)
{
values[0] = pixel[0][k];
values[1] = pixel[1][k];
val = averagetwo(needy, values);
*otherdest++ = val;
*otherdest++ = averagetwo(needy, values);
}
}
else
{
tile = ripple_pixel (drawable, tile,
x1, y1, x2, y2,
x, yi, &row, &col, pixel[0]);
tile = ripple_pixel (drawable, tile,
x1, y1, x2, y2,
x, yi + 1, &row, &col, pixel[1]);
tile = ripple_pixel (drawable, tile,
x1, y1, x2, y2,
x, yi - 1, &row, &col, pixel[2]);
tile = ripple_pixel (drawable, tile,
x1, y1, x2, y2,
x, yi + 2, &row, &col, pixel[3]);
gimp_pixel_fetcher_get_pixel (pft, x, yi, pixel[0]);
gimp_pixel_fetcher_get_pixel (pft, x, yi + 1,
pixel[1]);
gimp_pixel_fetcher_get_pixel (pft, x, yi - 1,
pixel[2]);
gimp_pixel_fetcher_get_pixel (pft, x, yi + 2,
pixel[3]);
for (k = 0; k < bytes; k++)
{
@ -408,27 +367,18 @@ ripple (GimpDrawable *drawable)
values[1] = pixel[1][k];
values[2] = pixel[2][k];
values[3] = pixel[3][k];
val = averagefour (needy, values);
*otherdest++ = val;
*otherdest++ = averagefour (needy, values);
}
}
} /* antialias */
else
{
tile = ripple_pixel (drawable, tile,
x1, y1, x2, y2,
x, yi, &row, &col, pixel[0]);
for (k = 0; k < bytes; k++)
*otherdest++ = pixel[0][k];
gimp_pixel_fetcher_get_pixel (pft, x, yi, otherdest);
}
dest += dest_rgn.rowstride;
} /* for */
for (k = 0; k < bytes; k++)
destline++;
destline += bytes;
} /* for */
progress += dest_rgn.w * dest_rgn.h;
@ -456,65 +406,44 @@ ripple (GimpDrawable *drawable)
/* Smear out the edges of the image by repeating pixels. */
else if (rvals.edges == SMEAR)
{
if (xi < 0)
xi = 0;
else if (xi > width - 1)
xi = width - 1;
xi = CLAMP(xi, 0, width - 1);
}
if ( rvals.antialias)
{
if (xi == width - 1)
{
tile = ripple_pixel (drawable, tile,
x1, y1, x2, y2,
xi, y, &row, &col, pixel[0]);
for (k = 0; k < bytes; k++)
*dest++ = pixel[0][k];
gimp_pixel_fetcher_get_pixel (pft, xi, y, dest);
dest += bytes;
}
else if (floor(needx) == -1)
{
tile = ripple_pixel (drawable, tile,
x1, y1, x2, y2,
0, y, &row, &col, pixel[0]);
for (k = 0; k < bytes; k++)
*dest++ = pixel[0][k];
gimp_pixel_fetcher_get_pixel (pft, 0, y, dest);
dest += bytes;
}
else if (xi == width - 2 || xi == 0)
{
tile = ripple_pixel (drawable, tile,
x1, y1, x2, y2,
xi, y, &row, &col, pixel[0]);
tile = ripple_pixel (drawable, tile,
x1, y1, x2, y2,
xi + 1, y, &row, &col, pixel[1]);
gimp_pixel_fetcher_get_pixel (pft, xi, y, pixel[0]);
gimp_pixel_fetcher_get_pixel (pft, xi + 1, y,
pixel[1]);
for (k = 0; k < bytes; k++)
{
values[0] = pixel[0][k];
values[1] = pixel[1][k];
val = averagetwo (needx, values);
*dest++ = val;
*dest++ = averagetwo (needx, values);
}
}
else
{
tile = ripple_pixel (drawable, tile,
x1, y1, x2, y2,
xi, y, &row, &col, pixel[0]);
tile = ripple_pixel (drawable, tile,
x1, y1, x2, y2,
xi + 1, y, &row, &col, pixel[1]);
tile = ripple_pixel (drawable, tile,
x1, y1, x2, y2,
xi - 1 , y, &row, &col, pixel[2]);
tile = ripple_pixel (drawable, tile,
x1, y1, x2, y2,
xi + 2, y, &row, &col, pixel[3]);
gimp_pixel_fetcher_get_pixel (pft, xi, y, pixel[0]);
gimp_pixel_fetcher_get_pixel (pft, xi + 1, y,
pixel[1]);
gimp_pixel_fetcher_get_pixel (pft, xi - 1, y,
pixel[2]);
gimp_pixel_fetcher_get_pixel (pft, xi + 2, y,
pixel[3]);
for (k = 0; k < bytes; k++)
{
@ -522,22 +451,15 @@ ripple (GimpDrawable *drawable)
values[1] = pixel[1][k];
values[2] = pixel[2][k];
values[3] = pixel[3][k];
val = averagefour (needx, values);
*dest++ = val;
*dest++ = averagefour (needx, values);
}
}
} /* antialias */
else
{
tile = ripple_pixel (drawable, tile,
x1, y1, x2, y2,
xi, y, &row, &col, pixel[0]);
for (k = 0; k < bytes; k++)
*dest++ = pixel[0][k];
gimp_pixel_fetcher_get_pixel (pft, xi, y, dest);
dest += bytes;
}
} /* for */
@ -549,14 +471,13 @@ ripple (GimpDrawable *drawable)
}
} /* for */
if (tile)
gimp_tile_unref (tile, FALSE);
gimp_pixel_fetcher_destroy (pft);
/* update the region */
gimp_drawable_flush (drawable);
gimp_drawable_merge_shadow (drawable->drawable_id, TRUE);
gimp_drawable_update (drawable->drawable_id, x1, y1, (x2 - x1), (y2 - y1));
} /* ripple */
}
static gint
ripple_dialog (void)
@ -720,48 +641,6 @@ ripple_dialog (void)
return rpint.run;
}
static GimpTile *
ripple_pixel (GimpDrawable *drawable,
GimpTile *tile,
gint x1,
gint y1,
gint x2,
gint y2,
gint x,
gint y,
gint *row,
gint *col,
guchar *pixel)
{
static guchar empty_pixel[4] = {0, 0, 0, 0};
guchar *data;
gint b;
if (x >= x1 && y >= y1 && x < x2 && y < y2)
{
if ((x >> 6 != *col) || (y >> 6 != *row))
{
*col = x / 64;
*row = y / 64;
if (tile)
gimp_tile_unref (tile, FALSE);
tile = gimp_drawable_get_tile (drawable, FALSE, *row, *col);
gimp_tile_ref (tile);
}
data = tile->data + tile->bpp * (tile->ewidth * (y % 64) + (x % 64));
}
else
data = empty_pixel;
for (b = 0; b < drawable->bpp; b++)
pixel[b] = data[b];
return tile;
}
/* Ripple interface functions */
static void

124
plug-ins/common/shift.c
View File

@ -24,7 +24,6 @@
#include "config.h"
#include <time.h>
#include <stdio.h>
#include <stdlib.h>
@ -71,19 +70,6 @@ static void shift_ok_callback (GtkWidget *widget,
gpointer data);
static void shift_amount_update_callback(GtkWidget * widget, gpointer data);
static GimpTile * shift_pixel (GimpDrawable *drawable,
GimpTile *tile,
gint x1,
gint y1,
gint x2,
gint y2,
gint x,
gint y,
gint *row,
gint *col,
guchar *pixel);
/***** Local vars *****/
GimpPlugInInfo PLUG_IN_INFO =
@ -235,32 +221,24 @@ static void
shift (GimpDrawable *drawable)
{
GimpPixelRgn dest_rgn;
GimpTile * tile = NULL;
gint row = -1;
gint col = -1;
gpointer pr;
GimpPixelFetcher *pft;
gint width, height;
gint bytes;
guchar *destline;
guchar *dest;
guchar *otherdest;
guchar pixel[4][4];
gint x1, y1, x2, y2;
gint x, y;
gint progress, max_progress;
gint amount;
gint xdist, ydist;
gint amount;
gint xdist, ydist;
gint xi, yi;
gint k;
GRand *gr; /* The random number generator we're using */
gr = g_rand_new ();
/* Get selection area */
pft = gimp_pixel_fetcher_new (drawable);
gimp_drawable_mask_bounds (drawable->drawable_id, &x1, &y1, &x2, &y2);
width = drawable->width;
@ -286,61 +264,45 @@ shift (GimpDrawable *drawable)
pr != NULL;
pr = gimp_pixel_rgns_process (pr))
{
destline = dest_rgn.data;
if (shvals.orientation == VERTICAL)
{
destline = dest_rgn.data;
for (x = dest_rgn.x; x < (dest_rgn.x + dest_rgn.w); x++)
for (x = dest_rgn.x; x < dest_rgn.x + dest_rgn.w; x++)
{
dest = destline;
ydist = g_rand_int_range (gr, -(amount + 1)/2.0, (amount + 1)/2.0 );
for (y = dest_rgn.y; y < (dest_rgn.y + dest_rgn.h); y++)
ydist = g_rand_int_range (gr, -(amount + 1) / 2.0,
(amount + 1) / 2.0 );
for (y = dest_rgn.y; y < dest_rgn.y + dest_rgn.h; y++)
{
otherdest = dest;
yi = (y + ydist + height)%height; /* add width before % because % isn't a true modulo */
tile = shift_pixel (drawable, tile, x1, y1, x2, y2, x, yi, &row, &col, pixel[0]);
for (k = 0; k < bytes; k++)
*otherdest++ = pixel[0][k];
gimp_pixel_fetcher_get_pixel2 (pft, x, y + ydist,
PIXEL_WRAP, dest);
dest += dest_rgn.rowstride;
}
destline += bytes;
}
progress += dest_rgn.w * dest_rgn.h;
gimp_progress_update ((double) progress / (double) max_progress);
}
else
{
destline = dest_rgn.data;
for (y = dest_rgn.y; y < (dest_rgn.y + dest_rgn.h); y++)
for (y = dest_rgn.y; y < dest_rgn.y + dest_rgn.h; y++)
{
dest = destline;
xdist = g_rand_int_range (gr, -(amount + 1)/2.0, (amount + 1)/2.0);
for (x = dest_rgn.x; x < (dest_rgn.x + dest_rgn.w); x++)
xdist = g_rand_int_range (gr, -(amount + 1) / 2.0,
(amount + 1) / 2.0);
for (x = dest_rgn.x; x < dest_rgn.x + dest_rgn.w; x++)
{
xi = (x + xdist + width)%width; /* add width before % because % isn't a true modulo */
tile = shift_pixel (drawable, tile, x1, y1, x2, y2, xi, y, &row, &col, pixel[0]);
for (k = 0; k < bytes; k++)
*dest++ = pixel[0][k];
gimp_pixel_fetcher_get_pixel2 (pft, x + xdist, y,
PIXEL_WRAP, dest);
dest += bytes;
}
destline += dest_rgn.rowstride;
}
progress += dest_rgn.w * dest_rgn.h;
gimp_progress_update ((double) progress / (double) max_progress);
}
progress += dest_rgn.w * dest_rgn.h;
gimp_progress_update ((double) progress / (double) max_progress);
}
if (tile)
gimp_tile_unref (tile, FALSE);
gimp_pixel_fetcher_destroy (pft);
/* update the region */
gimp_drawable_flush (drawable);
@ -453,43 +415,3 @@ shift_ok_callback (GtkWidget *widget,
gtk_widget_destroy (GTK_WIDGET (data));
}
static GimpTile *
shift_pixel (GimpDrawable *drawable,
GimpTile *tile,
gint x1,
gint y1,
gint x2,
gint y2,
gint x,
gint y,
gint *row,
gint *col,
guchar *pixel)
{
static guchar empty_pixel[4] = {0, 0, 0, 0};
guchar *data;
gint b;
if (x >= x1 && y >= y1 && x < x2 && y < y2)
{
if ((x >> 6 != *col) || (y >> 6 != *row))
{
*col = x / 64;
*row = y / 64;
if (tile)
gimp_tile_unref (tile, FALSE);
tile = gimp_drawable_get_tile (drawable, FALSE, *row, *col);
gimp_tile_ref (tile);
}
data = tile->data + tile->bpp * (tile->ewidth * (y % 64) + (x % 64));
}
else
data = empty_pixel;
for (b = 0; b < drawable->bpp; b++)
pixel[b] = data[b];
return tile;
}

112
plug-ins/common/spread.c
View File

@ -68,19 +68,6 @@ static gint spread_dialog (gint32 image_ID,
static void spread_ok_callback (GtkWidget *widget,
gpointer data);
static GimpTile * spread_pixel (GimpDrawable *drawable,
GimpTile *tile,
gint x1,
gint y1,
gint x2,
gint y2,
gint x,
gint y,
gint *row,
gint *col,
guchar *pixel);
/***** Local vars *****/
GimpPlugInInfo PLUG_IN_INFO =
@ -238,31 +225,26 @@ static void
spread (GimpDrawable *drawable)
{
GimpPixelRgn dest_rgn;
GimpTile *tile = NULL;
gint row = -1;
gint col = -1;
gpointer pr;
GimpPixelFetcher *pft;
gint width, height;
gint bytes;
guchar *destrow;
guchar *dest;
guchar pixel[4][4];
gint x1, y1, x2, y2;
gint x, y;
gint progress, max_progress;
gdouble x_amount, y_amount;
gdouble angle;
gint xdist, ydist;
gint xi, yi;
gint k;
GRand *gr;
gr = g_rand_new ();
/* Get selection area */
pft = gimp_pixel_fetcher_new (drawable);
gimp_drawable_mask_bounds (drawable->drawable_id, &x1, &y1, &x2, &y2);
@ -308,46 +290,40 @@ spread (GimpDrawable *drawable)
for (x = dest_rgn.x; x < (dest_rgn.x + dest_rgn.w); x++)
{
/* get random angle, x distance, and y distance */
xdist = g_rand_int_range (gr, -(x_amount + 1)/2, (x_amount + 1)/2);
ydist = g_rand_int_range (gr, -(y_amount + 1)/2, (y_amount + 1)/2);
xdist = g_rand_int_range (gr, -(x_amount + 1) / 2,
(x_amount + 1) / 2);
ydist = g_rand_int_range (gr, -(y_amount + 1)/2,
(y_amount + 1) / 2);
angle = g_rand_double_range (gr, -G_PI, G_PI);
xi = x + floor(sin(angle)*xdist);
yi = y + floor(cos(angle)*ydist);
xi = x + floor(sin(angle) * xdist);
yi = y + floor(cos(angle) * ydist);
/* Only displace the pixel if it's within the bounds of the image. */
/* Only displace the pixel if it's within the bounds of the
image. */
if ((xi >= 0) && (xi < width) && (yi >= 0) && (yi < height))
tile = spread_pixel (drawable, tile,
x1, y1, x2, y2, xi, yi,
&row, &col, pixel[0]);
else
{
/* Else just copy it */
tile = spread_pixel (drawable, tile,
x1, y1, x2, y2, x, y,
&row, &col, pixel[0]);
}
for (k = 0; k < bytes; k++)
*dest++ = pixel[0][k];
} /* for */
{
gimp_pixel_fetcher_get_pixel (pft, xi, yi, dest);
}
else /* Else just copy it */
{
gimp_pixel_fetcher_get_pixel (pft, x, y, dest);
}
dest += bytes;
}
destrow += dest_rgn.rowstride;;
} /* for */
}
progress += dest_rgn.w * dest_rgn.h;
gimp_progress_update ((double) progress / (double) max_progress);
} /* for */
}
if (tile)
gimp_tile_unref (tile, FALSE);
gimp_pixel_fetcher_destroy (pft);
/* update the region */
gimp_drawable_flush (drawable);
gimp_drawable_merge_shadow (drawable->drawable_id, TRUE);
gimp_drawable_update (drawable->drawable_id, x1, y1, (x2 - x1), (y2 - y1));
} /* spread */
}
static gint
spread_dialog (gint32 image_ID,
@ -431,43 +407,3 @@ spread_ok_callback (GtkWidget *widget,
gtk_widget_destroy (GTK_WIDGET (data));
}
static GimpTile *
spread_pixel (GimpDrawable *drawable,
GimpTile *tile,
gint x1,
gint y1,
gint x2,
gint y2,
gint x,
gint y,
gint *row,
gint *col,
guchar *pixel)
{
static guchar empty_pixel[4] = {0, 0, 0, 0};
guchar *data;
gint b;
if (x >= x1 && y >= y1 && x < x2 && y < y2)
{
if ((x >> 6 != *col) || (y >> 6 != *row))
{
*col = x >> 6;
*row = y >> 6;
if (tile)
gimp_tile_unref (tile, FALSE);
tile = gimp_drawable_get_tile (drawable, FALSE, *row, *col);
gimp_tile_ref (tile);
}
data = tile->data + tile->bpp * (tile->ewidth * (y % 64) + (x % 64));
}
else
data = empty_pixel;
for (b = 0; b < drawable->bpp; b++)
pixel[b] = data[b];
return tile;
}

80
plug-ins/common/tileit.c
View File

@ -96,9 +96,7 @@ static TileItInterface tint =
};
static GimpDrawable *tileitdrawable;
static gint tile_width, tile_height;
static GimpTile *the_tile = NULL;
static gint img_width, img_height,img_bpp;
static gint img_bpp;
static void query (void);
static void run (gchar *name,
@ -203,7 +201,7 @@ Reset_Call res_call =
#define HORIZONTAL 0x1
#define VERTICAL 0x2
gint tileactions[MAX_SEGS][MAX_SEGS];
static gint tileactions[MAX_SEGS][MAX_SEGS];
/* What actions buttons toggled */
static gint do_horz = FALSE;
@ -266,14 +264,8 @@ run (gchar *name,
tileitdrawable = drawable = gimp_drawable_get (param[2].data.d_drawable);
img_width = gimp_drawable_width (tileitdrawable->drawable_id);
img_height = gimp_drawable_height (tileitdrawable->drawable_id);
has_alpha = gimp_drawable_has_alpha (tileitdrawable->drawable_id);
tile_width = gimp_tile_width ();
tile_height = gimp_tile_height ();
gimp_drawable_mask_bounds (drawable->drawable_id,
&sel_x1, &sel_y1, &sel_x2, &sel_y2);
@ -585,7 +577,7 @@ tileit_dialog (void)
G_CALLBACK (tileit_radio_update),
&exp_call.type);
button = gtk_button_new_with_mnemonic (_("_Apply"));
button = gtk_button_new_from_stock (GTK_STOCK_APPLY);
gtk_table_attach (GTK_TABLE (table), button, 3, 4, 2, 4, 0, 0, 0, 0);
gtk_widget_show (button);
@ -773,7 +765,7 @@ exp_need_update (gint nx,
}
}
static gint
static gboolean
tileit_preview_events (GtkWidget *widget,
GdkEvent *event)
{
@ -1007,51 +999,6 @@ cache_preview (void)
g_free (src_rows);
}
static void
tileit_get_pixel (gint x,
gint y,
guchar *pixel)
{
static gint row = -1;
static gint col = -1;
gint newcol, newrow;
gint newcoloff, newrowoff;
guchar *p;
int i;
if ((x < 0) || (x >= img_width) || (y < 0) || (y >= img_height)) {
pixel[0] = 0;
pixel[1] = 0;
pixel[2] = 0;
pixel[3] = 0;
return;
}
newcol = x / tile_width;
newcoloff = x % tile_width;
newrow = y / tile_height;
newrowoff = y % tile_height;
if ((col != newcol) || (row != newrow) || (the_tile == NULL)) {
if (the_tile != NULL)
gimp_tile_unref(the_tile, FALSE);
the_tile = gimp_drawable_get_tile(tileitdrawable, FALSE, newrow, newcol);
gimp_tile_ref(the_tile);
col = newcol;
row = newrow;
}
p = the_tile->data + the_tile->bpp * (the_tile->ewidth * newrowoff + newcoloff);
for (i = img_bpp; i; i--)
*pixel++ = *p++;
}
static void
do_tiles(void)
{
@ -1065,8 +1012,11 @@ do_tiles(void)
guchar pixel[4];
int nc,nr;
int i;
GimpPixelFetcher *pft;
/* Initialize pixel region */
pft = gimp_pixel_fetcher_new (tileitdrawable);
gimp_pixel_rgn_init(&dest_rgn, tileitdrawable, sel_x1, sel_y1, sel_width, sel_height, TRUE, TRUE);
@ -1093,7 +1043,10 @@ do_tiles(void)
sel_height,
col-sel_x1,row-sel_y1,
&nc,&nr);
tileit_get_pixel(nc+sel_x1,nr+sel_y1,pixel);
gimp_pixel_fetcher_get_pixel (pft, nc + sel_x1, nr + sel_y1,
pixel);
for (i = 0; i < bpp; i++)
*dest++ = pixel[i];
@ -1108,12 +1061,9 @@ do_tiles(void)
progress += dest_rgn.w * dest_rgn.h;
gimp_progress_update((double) progress / max_progress);
}
if (the_tile != NULL) {
gimp_tile_unref(the_tile, FALSE);
the_tile = NULL;
}
gimp_pixel_fetcher_destroy (pft);
gimp_drawable_flush(tileitdrawable);
gimp_drawable_merge_shadow(tileitdrawable->drawable_id, TRUE);
gimp_drawable_update(tileitdrawable->drawable_id,