[gegl/wip/pippin/pipeline: 88/95] ops update



commit 20f43570c994de32041934bfbecfb3a8b0780c4f
Author: Øyvind Kolås <pippin gimp org>
Date:   Wed Jul 25 14:38:30 2018 +0200

    ops update

 gegl/operation/gegl-operation-point-composer.c  |  2 +-
 gegl/operation/gegl-operation-point-composer3.c |  2 +-
 gegl/operation/gegl-operation-point-filter.c    | 11 +++++++++--
 3 files changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/gegl/operation/gegl-operation-point-composer.c b/gegl/operation/gegl-operation-point-composer.c
index 6e2cd4881..c0e0901ff 100644
--- a/gegl/operation/gegl-operation-point-composer.c
+++ b/gegl/operation/gegl-operation-point-composer.c
@@ -111,7 +111,7 @@ gegl_operation_composer_process (GeglOperation        *operation,
   GeglBuffer                 *aux;
   GeglBuffer                 *output;
   gboolean                    success = FALSE;
-  PipeLine                   *pipeline;
+  GeglOperationPipeLine      *pipeline;
 
   GeglRectangle scaled_result = *result;
   if (level)
diff --git a/gegl/operation/gegl-operation-point-composer3.c b/gegl/operation/gegl-operation-point-composer3.c
index a5f8caa27..945bed154 100644
--- a/gegl/operation/gegl-operation-point-composer3.c
+++ b/gegl/operation/gegl-operation-point-composer3.c
@@ -118,7 +118,7 @@ gegl_operation_composer3_process (GeglOperation        *operation,
   GeglBuffer                  *aux2;
   GeglBuffer                  *output;
   gboolean                     success = FALSE;
-  PipeLine                    *pipeline;
+  GeglOperationPipeLine       *pipeline;
 
   if (strcmp (output_prop, "output"))
     {
diff --git a/gegl/operation/gegl-operation-point-filter.c b/gegl/operation/gegl-operation-point-filter.c
index f055ac07f..3c00f2001 100644
--- a/gegl/operation/gegl-operation-point-filter.c
+++ b/gegl/operation/gegl-operation-point-filter.c
@@ -101,7 +101,7 @@ gegl_operation_filter_process (GeglOperation        *operation,
   GeglBuffer                 *input;
   GeglBuffer                 *output;
   gboolean                    success = FALSE;
-  PipeLine                   *pipeline;
+  GeglOperationPipeLine      *pipeline;
 
   GeglRectangle scaled_result = *result;
   if (level)
@@ -131,8 +131,10 @@ gegl_operation_filter_process (GeglOperation        *operation,
     return FALSE;
   }
 
-  pipeline = gegl_operation_pipeline_ensure (operation, context, input);
+  if (gegl_operation_is_pipelinable (operation))
+  {
 
+  pipeline = gegl_operation_pipeline_ensure (operation, context, input);
 
   gegl_operation_pipeline_add (pipeline, operation, 1,
        gegl_operation_get_format (operation, "input"),
@@ -157,7 +159,12 @@ gegl_operation_filter_process (GeglOperation        *operation,
   gegl_operation_context_set_pipeline (context, NULL);
 
   return TRUE;
+  }
 
+  output = gegl_operation_context_get_output_maybe_in_place (operation,
+                                                             context,
+                                                             input,
+                                                             result);
 
   if (input != NULL)
     {


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