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

don't call gimp_progress_update() for each and every pixel. Every few rows 

2004-12-24  Sven Neumann  <sven@gimp.org>

	* plug-ins/common/despeckle.c (despeckle_median): don't call
	gimp_progress_update() for each and every pixel. Every few rows
	should be enough. Fixes bug #162129.

	* plug-ins/common/blur.c: set progress to 1.0 when done, not to 100.
This commit is contained in:
Sven Neumann 2004-12-23 23:19:43 +00:00 committed by Sven Neumann
parent 68f0686c27
commit 6e1ff6f29d
4 changed files with 34 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2004-12-24 Sven Neumann <sven@gimp.org>
* plug-ins/common/despeckle.c (despeckle_median): don't call
gimp_progress_update() for each and every pixel. Every few rows
should be enough. Fixes bug #162129.
* plug-ins/common/blur.c: set progress to 1.0 when done, not to 100.
2004-12-23 Bill Skaggs <weskaggs@primate.ucdavis.edu>
* plug-ins/common/mblur.c: set up tile cache before

2
NEWS
View File

@ -19,3 +19,5 @@ Bugs fixed in GIMP 2.2.1
- fixed channel drag-n-drop (bug #161877)
- fixed misbehaviour of entries in Scale and Resize dialogs (bug #161756)
- speed up preview in Motion Blur plug-in
- fixed bug in Despeckle plug-in that caused it to run very slowly
(bug #162129)

5
plug-ins/common/blur.c
View File

@ -366,10 +366,11 @@ blur (GimpDrawable *drawable)
nr = tmp;
if (PROG_UPDATE_TIME)
gimp_progress_update ((double) row / (double) (y2 - y1));
gimp_progress_update ((gdouble) row / (gdouble) (y2 - y1));
}
gimp_progress_update ((double) 100);
gimp_progress_update (1.0);
/*
* update the blurred region
*/

44
plug-ins/common/despeckle.c
View File

@ -363,15 +363,13 @@ despeckle (void)
{
GimpPixelRgn src_rgn, /* Source image region */
dst_rgn;
guchar *src, *dst;
guchar *src, *dst;
gint img_bpp;
gint width;
gint height;
gint x1, y1 ,x2 ,y2;
img_bpp = gimp_drawable_bpp (drawable->drawable_id);
img_bpp = gimp_drawable_bpp (drawable->drawable_id);
gimp_drawable_mask_bounds (drawable->drawable_id, &x1, &y1, &x2, &y2);
width = x2 - x1;
@ -379,22 +377,22 @@ despeckle (void)
gimp_pixel_rgn_init (&src_rgn, drawable, x1, y1, width, height, FALSE, FALSE);
gimp_pixel_rgn_init (&dst_rgn, drawable, x1, y1, width, height, TRUE, TRUE);
src = g_new (guchar, width * height * img_bpp);
dst = g_new (guchar, width * height * img_bpp);
src = g_new (guchar, width * height * img_bpp);
dst = g_new (guchar, width * height * img_bpp);
gimp_pixel_rgn_get_rect (&src_rgn, src, x1, y1, width, height);
despeckle_median(src, dst, width, height, img_bpp, despeckle_radius, FALSE);
despeckle_median (src, dst, width, height, img_bpp, despeckle_radius, FALSE);
/*
* Update the screen...
*/
gimp_pixel_rgn_set_rect (&dst_rgn, dst, x1, y1, width, height);
gimp_drawable_flush (drawable);
gimp_drawable_merge_shadow (drawable->drawable_id, TRUE);
gimp_drawable_update (drawable->drawable_id, x1, y1, width, height);
g_free(src);
g_free(dst);
g_free (dst);
g_free (src);
}
@ -587,7 +585,7 @@ preview_update (GtkWidget *widget)
src = g_new (guchar, width * height * img_bpp);
gimp_pixel_rgn_get_rect (&src_rgn, src, x1, y1, width, height);
despeckle_median(src, dst, width, height, img_bpp, despeckle_radius, TRUE);
despeckle_median (src, dst, width, height, img_bpp, despeckle_radius, TRUE);
/*
* Update the screen...
@ -653,7 +651,6 @@ despeckle_median (guchar *src,
for (x = 0; x < width; x++)
{
prog += width;
for (y = 0; y < height; y++)
{
hist0 = 0;
@ -724,14 +721,17 @@ despeckle_median (guchar *src,
radius--;
}
}
if (!preview)
{
gimp_progress_update (prog/maxprog);
}
}
prog += height;
if (!preview && x % 5 == 0)
gimp_progress_update (prog / maxprog);
}
if (!preview)
gimp_progress_update (1.0);
g_free (buf);
g_free (ibuf);
}
@ -806,7 +806,7 @@ quick_median_select (guchar **p,
for (;;)
{
do ll++;
while (i[low] > i[ll] );
while (i[low] > i[ll]);
do hh--;
while (i[hh] > i[low]);
@ -846,7 +846,5 @@ pixel_copy (guchar *dest,
gint n)
{
for (; n > 0; n--, dest++, src++)
{
*dest = *src;
}
*dest = *src;
}