callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app: switch to gegl_buffer_sample() in GimpOperationShapeburst

Browse Source 
and fix the progress fractions.
This commit is contained in:
Michael Natterer
2012-03-27 09:52:10 +02:00
parent 42e2f5ebfe
commit b1591fccc7
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/gegl/gimpoperationshapeburst.c
View File

@ -195,8 +195,6 @@ gimp_operation_shapeburst_process (GeglOperation *operation,
gfloat *memory; gfloat *memory;
gint length; gint length;
gint i; gint i;
gint max_progress = roi->width * roi->height;
gint progress = 0;
length = roi->width + 1; length = roi->width + 1;
memory = g_new (gfloat, length * 2); memory = g_new (gfloat, length * 2);
@ -239,17 +237,18 @@ gimp_operation_shapeburst_process (GeglOperation *operation,
{ {
guchar src_uchar; guchar src_uchar;
#if 0 #if 1
/* FIXME: this should be much faster, it converts /* FIXME: this should be much faster, it converts
* to 32 bit rgba intermediately, bah... * to 32 bit rgba intermediately, bah...
*/ */
gegl_buffer_sample (input, x, y, NULL, &src_uchar, gegl_buffer_sample (input, x, y, NULL, &src_uchar,
input_format, input_format,
GEGL_SAMPLER_NEAREST, GEGL_ABYSS_NONE); GEGL_SAMPLER_NEAREST, GEGL_ABYSS_NONE);
#endif #else
gegl_buffer_get (input, GIMP_GEGL_RECT (x, y, 1, 1), 1.0, gegl_buffer_get (input, GIMP_GEGL_RECT (x, y, 1, 1), 1.0,
input_format, &src_uchar, input_format, &src_uchar,
GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE); GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE);
#endif
src = src_uchar; src = src_uchar;
@ -304,9 +303,8 @@ gimp_operation_shapeburst_process (GeglOperation *operation,
distp_prev = distp_cur; distp_prev = distp_cur;
distp_cur = tmp; distp_cur = tmp;
progress += roi->height;
g_object_set (operation, g_object_set (operation,
"progress", (gdouble) progress / max_progress, "progress", (gdouble) i / roi->height,
NULL); NULL);
} }