[gimp/gimp-2-10] Revert "app: avoid NULL output in layer-mode ops"



commit e457ddf99354673e9078dc69388f8a8a4265e6a2
Author: Ell <ell_se yahoo com>
Date:   Fri May 31 12:59:17 2019 -0400

    Revert "app: avoid NULL output in layer-mode ops"
    
    On a second thought... nope :)  We'll fix it another way.
    
    This reverts commit 60947b7a34826657395ca485d334ccb302106e07.
    
    (cherry picked from commit 3766af9ac9ff3bb595243235c585e07425455c22)

 app/operations/layer-modes/gimpoperationlayermode.c |  7 +------
 app/operations/layer-modes/gimpoperationreplace.c   | 11 ++---------
 2 files changed, 3 insertions(+), 15 deletions(-)
---
diff --git a/app/operations/layer-modes/gimpoperationlayermode.c 
b/app/operations/layer-modes/gimpoperationlayermode.c
index f925df735e..6fa277e4de 100644
--- a/app/operations/layer-modes/gimpoperationlayermode.c
+++ b/app/operations/layer-modes/gimpoperationlayermode.c
@@ -450,12 +450,7 @@ gimp_operation_layer_mode_parent_process (GeglOperation        *operation,
       else
         {
           /* ... the output is empty. */
-          gegl_operation_context_take_object (
-            context, "output",
-            G_OBJECT (gegl_buffer_new (result,
-                                       gegl_operation_get_format (operation,
-                                                                  "output"))));
-
+          gegl_operation_context_set_object (context, "output", NULL);
           return TRUE;
         }
     }
diff --git a/app/operations/layer-modes/gimpoperationreplace.c 
b/app/operations/layer-modes/gimpoperationreplace.c
index 121801879f..18111fd402 100644
--- a/app/operations/layer-modes/gimpoperationreplace.c
+++ b/app/operations/layer-modes/gimpoperationreplace.c
@@ -96,16 +96,9 @@ gimp_operation_replace_parent_process (GeglOperation        *op,
     {
       GObject *aux;
 
-      aux = gegl_operation_context_dup_object (context, "aux");
+      aux = gegl_operation_context_get_object (context, "aux");
 
-      if (! aux)
-        {
-          aux = G_OBJECT (
-            gegl_buffer_new (result,
-                             gegl_operation_get_format (op, "output")));
-        }
-
-      gegl_operation_context_take_object (context, "output", aux);
+      gegl_operation_context_set_object (context, "output", aux);
 
       return TRUE;
     }


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