[gimp/gimp-2-10] app: in gimp_tile_handler_validate_buffer_copy(), temporarily remove source handler

[Ell <ell src gnome org>]

commit bb4b1e3f1f132fa2ea19b9da4947dceab1b7d6ed
Author: Ell <ell_se yahoo com>
Date:   Sat Jan 12 03:46:18 2019 -0500

    app: in gimp_tile_handler_validate_buffer_copy(), temporarily remove source handler
    
    In gimp_tile_handler_validate_buffer_copy(), temporarily remove the
    source buffer's validate handler, is exists, so that the subsequent
    gegl_buffer_copy() can use fast tile copying, using the TILE_COPY
    command.  GEGL currently only uses TILE_COPY when the source buffer
    doesn't have any user-provided tile handlers.
    
    (cherry picked from commit f4750a0ae7610bbb4e76117335075505c981ab4a)

 app/gegl/gimptilehandlervalidate.c | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)
---
diff --git a/app/gegl/gimptilehandlervalidate.c b/app/gegl/gimptilehandlervalidate.c
index 14190cb9c8..813ee90108 100644
--- a/app/gegl/gimptilehandlervalidate.c
+++ b/app/gegl/gimptilehandlervalidate.c
@@ -595,17 +595,32 @@ gimp_tile_handler_validate_buffer_copy (GeglBuffer          *src_buffer,
   real_src_rect.width  = CLAMP (real_src_rect.width,  0, real_dst_rect.width);
   real_src_rect.height = CLAMP (real_src_rect.height, 0, real_dst_rect.height);
 
+  /* temporarily remove the source buffer's validate handler, so that
+   * gegl_buffer_copy() can use fast tile copying, using the TILE_COPY command.
+   * currently, gegl only uses TILE_COPY when the source buffer has no user-
+   * provided tile handlers.
+   */
   if (src_validate)
-    src_validate->suspend_validate++;
+    {
+      g_object_ref (src_validate);
+
+      gimp_tile_handler_validate_unassign (src_validate, src_buffer);
+    }
+
   dst_validate->suspend_validate++;
 
   gegl_buffer_copy (src_buffer, &real_src_rect, GEGL_ABYSS_NONE,
                     dst_buffer, &real_dst_rect);
 
-  if (src_validate)
-    src_validate->suspend_validate--;
   dst_validate->suspend_validate--;
 
+  if (src_validate)
+    {
+      gimp_tile_handler_validate_assign (src_validate, src_buffer);
+
+      g_object_unref (src_validate);
+    }
+
   cairo_region_subtract_rectangle (dst_validate->dirty_region,
                                    (cairo_rectangle_int_t *) &real_dst_rect);