[gimp/gimp-2-10] Revert "Bug 796090 - (wrong) true-color preview of GEGL filter ops, ..."

[Ell <ell src gnome org>]

commit 96a16b8db77c25fdbfc4a854f392b2344f653485
Author: Ell <ell_se yahoo com>
Date:   Fri Dec 28 02:19:02 2018 -0500

    Revert "Bug 796090 - (wrong) true-color preview of GEGL filter ops, ..."
    
    We now perform the conversion of filter output to the drawable
    format as part of the individual filter nodes (see the last few
    commits), so there's no need for another conversion after the
    filter stack.
    
    This reverts commit d6e0ca505440596e81593cf9ec0fac4f0d9e2ba8.
    
    (cherry picked from commit 95393722ccd70c9741b4b5fea57d5cd175b9cd83)

 app/core/gimpdrawable-private.h |  1 -
 app/core/gimpdrawable.c         | 45 ++++++-----------------------------------
 2 files changed, 6 insertions(+), 40 deletions(-)
---
diff --git a/app/core/gimpdrawable-private.h b/app/core/gimpdrawable-private.h
index 67f142f6c7..593f53e0b7 100644
--- a/app/core/gimpdrawable-private.h
+++ b/app/core/gimpdrawable-private.h
@@ -26,7 +26,6 @@ struct _GimpDrawablePrivate
   GeglNode       *source_node;
   GeglNode       *buffer_source_node;
   GimpContainer  *filter_stack;
-  GeglNode       *convert_format;
 
   GimpLayer      *floating_selection;
   GimpFilter     *fs_filter;
diff --git a/app/core/gimpdrawable.c b/app/core/gimpdrawable.c
index 1d9e07eaac..f06d318389 100644
--- a/app/core/gimpdrawable.c
+++ b/app/core/gimpdrawable.c
@@ -840,21 +840,6 @@ gimp_drawable_real_set_buffer (GimpDrawable *drawable,
                    "buffer", gimp_drawable_get_buffer (drawable),
                    NULL);
 
-  if (drawable->private->convert_format)
-    {
-      const Babl *format = gimp_drawable_get_format (drawable);
-
-      if (babl_format_is_palette (format))
-        gegl_node_set (drawable->private->convert_format,
-                       "operation", "gegl:convert-format",
-                       "format",    gimp_drawable_get_format (drawable),
-                       NULL);
-      else
-        gegl_node_set (drawable->private->convert_format,
-                       "operation", "gegl:nop",
-                       NULL);
-    }
-
   gimp_item_set_offset (item, offset_x, offset_y);
   gimp_item_set_size (item,
                       gegl_buffer_get_width  (buffer),
@@ -1352,11 +1337,10 @@ gimp_drawable_steal_buffer (GimpDrawable *drawable,
 GeglNode *
 gimp_drawable_get_source_node (GimpDrawable *drawable)
 {
-  const Babl *format;
-  GeglNode   *input;
-  GeglNode   *source;
-  GeglNode   *filter;
-  GeglNode   *output;
+  GeglNode *input;
+  GeglNode *source;
+  GeglNode *filter;
+  GeglNode *output;
 
   g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
 
@@ -1386,27 +1370,10 @@ gimp_drawable_get_source_node (GimpDrawable *drawable)
   gegl_node_connect_to (source, "output",
                         filter, "input");
 
-  format = gimp_drawable_get_format (drawable);
-
-  if (babl_format_is_palette (format))
-    drawable->private->convert_format =
-      gegl_node_new_child (drawable->private->source_node,
-                           "operation", "gegl:convert-format",
-                           "format",    gimp_drawable_get_format (drawable),
-                           NULL);
-  else
-    drawable->private->convert_format =
-      gegl_node_new_child (drawable->private->source_node,
-                           "operation", "gegl:nop",
-                           NULL);
-
-  gegl_node_connect_to (filter,                            "output",
-                        drawable->private->convert_format, "input");
-
   output = gegl_node_get_output_proxy (drawable->private->source_node, "output");
 
-  gegl_node_connect_to (drawable->private->convert_format, "output",
-                        output,                            "input");
+  gegl_node_connect_to (filter, "output",
+                        output, "input");
 
   if (gimp_drawable_get_floating_sel (drawable))
     _gimp_drawable_add_floating_sel_filter (drawable);