[gimp] app: enable the buffer copy in gimp_drawable_merge_filter() again



commit 1b1f3a60e2f95730b6ff19b6693ae648a47e9f75
Author: Michael Natterer <mitch gimp org>
Date:   Sun Jun 1 18:37:57 2014 +0200

    app: enable the buffer copy in gimp_drawable_merge_filter() again
    
    Thanks to gegl:copy-buffer this is now without much overhead.
    Edit->Fade now works again on the result of any GEGL op.

 app/core/gimpdrawable-filter.c |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)
---
diff --git a/app/core/gimpdrawable-filter.c b/app/core/gimpdrawable-filter.c
index 9f485a9..284a692 100644
--- a/app/core/gimpdrawable-filter.c
+++ b/app/core/gimpdrawable-filter.c
@@ -97,20 +97,14 @@ gimp_drawable_merge_filter (GimpDrawable *drawable,
                                 &rect.width, &rect.height))
     {
       GimpApplicator *applicator;
-      GeglNode       *node;
 
       gimp_drawable_push_undo (drawable, undo_desc, NULL,
                                rect.x, rect.y,
                                rect.width, rect.height);
 
-      node = gimp_filter_get_node (filter);
-
       applicator = gimp_filter_get_applicator (filter);
 
-      /* FIXME: disabled because it is unacceptable to run the
-       * filter twice, need to use whatever cached result
-       */
-      if (FALSE /* applicator */)
+      if (applicator)
         {
           GimpImage        *image = gimp_item_get_image (GIMP_ITEM (drawable));
           GimpDrawableUndo *undo;
@@ -129,7 +123,7 @@ gimp_drawable_merge_filter (GimpDrawable *drawable,
 
       gimp_gegl_apply_operation (gimp_drawable_get_buffer (drawable),
                                  progress, undo_desc,
-                                 node,
+                                 gimp_filter_get_node (filter),
                                  gimp_drawable_get_buffer (drawable),
                                  &rect);
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]