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

app: add "chunked" parameter to gimp_tile_handler_validate_validate() 

... which allows validating the area in chunks, instead of in a
single step.
This commit is contained in:
Ell 2020-03-14 13:52:01 +02:00
parent 30f509c84d
commit faf6acfb67
4 changed files with 47 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/core/gimpprojection.c
View File

@ -900,7 +900,7 @@ gimp_projection_paint_area (GimpProjection *proj,
proj->priv->validate_handler,
proj->priv->buffer,
&rect,
FALSE);
FALSE, FALSE);
}
else
{

57
app/gegl/gimptilehandlervalidate.c
View File

@ -25,6 +25,7 @@
#include "gimp-gegl-types.h"
#include "core/gimpchunkiterator.h"
#include "core/gimpmarshal.h"
#include "gimp-gegl-loops.h"
@ -532,9 +533,11 @@ void
gimp_tile_handler_validate_validate (GimpTileHandlerValidate *validate,
GeglBuffer *buffer,
const GeglRectangle *rect,
gboolean intersect)
gboolean intersect,
gboolean chunked)
{
GimpTileHandlerValidateClass *klass;
cairo_region_t *region = NULL;
g_return_if_fail (GIMP_IS_TILE_HANDLER_VALIDATE (validate));
g_return_if_fail (gimp_tile_handler_validate_get_assigned (buffer) ==
@ -547,30 +550,56 @@ gimp_tile_handler_validate_validate (GimpTileHandlerValidate *validate,
if (intersect)
{
cairo_region_t *region = cairo_region_copy (validate->dirty_region);
region = cairo_region_copy (validate->dirty_region);
cairo_region_intersect_rectangle (region,
(const cairo_rectangle_int_t *) rect);
}
else if (chunked)
{
region = cairo_region_create_rectangle (
(const cairo_rectangle_int_t *) rect);
}
if (region)
{
if (! cairo_region_is_empty (region))
{
gint n_rects;
gint i;
gimp_tile_handler_validate_begin_validate (validate);
n_rects = cairo_region_num_rectangles (region);
for (i = 0; i < n_rects; i++)
if (chunked)
{
cairo_rectangle_int_t blit_rect;
GimpChunkIterator *iter;
cairo_region_get_rectangle (region, i, &blit_rect);
iter = gimp_chunk_iterator_new (region);
region = NULL;
klass->validate_buffer (validate,
(const GeglRectangle *) &blit_rect,
buffer);
while (gimp_chunk_iterator_next (iter))
{
GeglRectangle blit_rect;
while (gimp_chunk_iterator_get_rect (iter, &blit_rect))
klass->validate_buffer (validate, &blit_rect, buffer);
}
}
else
{
gint n_rects;
gint i;
n_rects = cairo_region_num_rectangles (region);
for (i = 0; i < n_rects; i++)
{
cairo_rectangle_int_t blit_rect;
cairo_region_get_rectangle (region, i, &blit_rect);
klass->validate_buffer (validate,
(const GeglRectangle *) &blit_rect,
buffer);
}
}
gimp_tile_handler_validate_end_validate (validate);
@ -579,7 +608,7 @@ gimp_tile_handler_validate_validate (GimpTileHandlerValidate *validate,
(const cairo_rectangle_int_t *) rect);
}
cairo_region_destroy (region);
g_clear_pointer (&region, cairo_region_destroy);
}
else
{

3
app/gegl/gimptilehandlervalidate.h
View File

@ -95,7 +95,8 @@ void gimp_tile_handler_validate_end_validate (GimpTile
void gimp_tile_handler_validate_validate (GimpTileHandlerValidate *validate,
GeglBuffer *buffer,
const GeglRectangle *rect,
gboolean intersect);
gboolean intersect,
gboolean chunked);
gboolean gimp_tile_handler_validate_buffer_set_extent (GeglBuffer *buffer,
const GeglRectangle *extent);

2
app/operations/gimpoperationbuffersourcevalidate.c
View File

@ -286,7 +286,7 @@ gimp_operation_buffer_source_validate_process (GeglOperation *operation,
gimp_tile_handler_validate_validate (validate_handler,
buffer_source_validate->buffer,
&rect,
TRUE);
TRUE, FALSE);
}
gegl_operation_context_set_object (context, "output", G_OBJECT (buffer));