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

app: add progress handling to gimp_gegl_convert_color_profile,transform()

This commit is contained in:
Michael Natterer 2015-10-19 01:29:22 +02:00
parent 13c2721cde
commit 69abd4d972
5 changed files with 42 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/core/gimplayer-new.c
View File

@ -252,5 +252,5 @@ gimp_layer_new_convert_buffer (GimpLayer *layer,
gimp_gegl_convert_color_profile (src_buffer, NULL, src_profile,
dest_buffer, NULL, dest_profile,
GIMP_COLOR_RENDERING_INTENT_PERCEPTUAL,
TRUE);
TRUE, NULL);
}

2
app/core/gimplayer.c
View File

@ -1115,7 +1115,7 @@ gimp_layer_convert_type (GimpDrawable *drawable,
gimp_gegl_convert_color_profile (src_buffer, NULL, src_profile,
dest_buffer, NULL, dest_profile,
GIMP_COLOR_RENDERING_INTENT_PERCEPTUAL,
TRUE);
TRUE, NULL);
}
else
{

35
app/gegl/gimp-gegl-loops.c
View File

@ -34,6 +34,8 @@
#include "gimp-babl.h"
#include "gimp-gegl-loops.h"
#include "core/gimpprogress.h"
void
gimp_gegl_convolve (GeglBuffer *src_buffer,
@ -695,7 +697,8 @@ gimp_gegl_convert_color_profile (GeglBuffer *src_buffer,
const GeglRectangle *dest_rect,
GimpColorProfile *dest_profile,
GimpColorRenderingIntent intent,
gboolean bpc)
gboolean bpc,
GimpProgress *progress)
{
const Babl *src_format;
const Babl *dest_format;
@ -737,7 +740,7 @@ gimp_gegl_convert_color_profile (GeglBuffer *src_buffer,
{
gimp_gegl_convert_color_transform (src_buffer, src_rect, src_format,
dest_buffer, dest_rect, dest_format,
transform);
transform, progress);
cmsDeleteTransform (transform);
}
@ -746,6 +749,9 @@ gimp_gegl_convert_color_profile (GeglBuffer *src_buffer,
/* FIXME: no idea if this ever happens */
gegl_buffer_copy (src_buffer, src_rect, GEGL_ABYSS_NONE,
dest_buffer, dest_rect);
if (progress)
gimp_progress_set_value (progress, 1.0);
}
}
@ -756,10 +762,23 @@ gimp_gegl_convert_color_transform (GeglBuffer *src_buffer,
GeglBuffer *dest_buffer,
const GeglRectangle *dest_rect,
const Babl *dest_format,
GimpColorTransform transform)
GimpColorTransform transform,
GimpProgress *progress)
{
GeglBufferIterator *iter;
gboolean has_alpha;
gint total_pixels;
gint done_pixels = 0;
if (src_rect)
{
total_pixels = src_rect->width * src_rect->height;
}
else
{
total_pixels = (gegl_buffer_get_width (src_buffer) *
gegl_buffer_get_height (src_buffer));
}
has_alpha = babl_format_has_alpha (dest_format);
@ -787,5 +806,15 @@ gimp_gegl_convert_color_transform (GeglBuffer *src_buffer,
{
cmsDoTransform (transform,
iter->data[0], iter->data[1], iter->length);
done_pixels += iter->roi[0].width * iter->roi[0].height;
if (progress)
gimp_progress_set_value (progress,
(gdouble) done_pixels /
(gdouble) total_pixels);
}
if (progress)
gimp_progress_set_value (progress, 1.0);
}

6
app/gegl/gimp-gegl-loops.h
View File

@ -95,7 +95,8 @@ void gimp_gegl_convert_color_profile (GeglBuffer *src_buffer,
const GeglRectangle *dest_rect,
GimpColorProfile *dest_profile,
GimpColorRenderingIntent intent,
gboolean bpc);
gboolean bpc,
GimpProgress *progress);
void gimp_gegl_convert_color_transform
(GeglBuffer *src_buffer,
@ -104,7 +105,8 @@ void gimp_gegl_convert_color_transform
GeglBuffer *dest_buffer,
const GeglRectangle *dest_rect,
const Babl *dest_format,
GimpColorTransform transform);
GimpColorTransform transform,
GimpProgress *progress);
#endif /* __GIMP_GEGL_LOOPS_H__ */

6
app/widgets/gimpviewrenderer.c
View File

@ -1093,7 +1093,8 @@ gimp_view_render_temp_buf_to_surface (GimpViewRenderer *renderer,
dest_buffer,
GEGL_RECTANGLE (0, 0, 0, 0),
renderer->profile_dest_format,
renderer->profile_transform);
renderer->profile_transform,
NULL);
}
else
{
@ -1142,7 +1143,8 @@ gimp_view_render_temp_buf_to_surface (GimpViewRenderer *renderer,
dest_buffer,
GEGL_RECTANGLE (x, y, 0, 0),
renderer->profile_dest_format,
renderer->profile_transform);
renderer->profile_transform,
NULL);
}
else
{