Adding upstream version 2.10.22.upstream/2.10.22upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 499 insertions, 0 deletions

diff --git a/app/core/gimpdrawable-bucket-fill.c b/app/core/gimpdrawable-bucket-fill.c
new file mode 100644
index 0000000..1cef758
--- /dev/null
+++ b/app/core/gimpdrawable-bucket-fill.c
@@ -0,0 +1,499 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <cairo.h>
+#define GEGL_ITERATOR2_API
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
+
+#include "core-types.h"
+
+#include "gegl/gimp-gegl-apply-operation.h"
+#include "gegl/gimp-gegl-mask.h"
+#include "gegl/gimp-gegl-mask-combine.h"
+#include "gegl/gimp-gegl-utils.h"
+
+#include "operations/layer-modes/gimp-layer-modes.h"
+
+#include "gimp.h"
+#include "gimpchannel.h"
+#include "gimpdrawable.h"
+#include "gimpdrawable-bucket-fill.h"
+#include "gimpfilloptions.h"
+#include "gimpimage.h"
+#include "gimppickable.h"
+#include "gimppickable-contiguous-region.h"
+
+#include "gimp-intl.h"
+
+
+/*  public functions  */
+
+void
+gimp_drawable_bucket_fill (GimpDrawable         *drawable,
+                           GimpFillOptions      *options,
+                           gboolean              fill_transparent,
+                           GimpSelectCriterion   fill_criterion,
+                           gdouble               threshold,
+                           gboolean              sample_merged,
+                           gboolean              diagonal_neighbors,
+                           gdouble               seed_x,
+                           gdouble               seed_y)
+{
+  GimpImage  *image;
+  GeglBuffer *buffer;
+  gdouble     mask_x;
+  gdouble     mask_y;
+  gint        width, height;
+
+  g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
+  g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)));
+  g_return_if_fail (GIMP_IS_FILL_OPTIONS (options));
+
+  image = gimp_item_get_image (GIMP_ITEM (drawable));
+
+  gimp_set_busy (image->gimp);
+
+  buffer = gimp_drawable_get_bucket_fill_buffer (drawable, options,
+                                                 fill_transparent, fill_criterion,
+                                                 threshold, FALSE, sample_merged,
+                                                 diagonal_neighbors,
+                                                 seed_x, seed_y, NULL,
+                                                 &mask_x, &mask_y, &width, &height);
+
+  if (buffer)
+    {
+      /*  Apply it to the image  */
+      gimp_drawable_apply_buffer (drawable, buffer,
+                                  GEGL_RECTANGLE (0, 0, width, height),
+                                  TRUE, C_("undo-type", "Bucket Fill"),
+                                  gimp_context_get_opacity (GIMP_CONTEXT (options)),
+                                  gimp_context_get_paint_mode (GIMP_CONTEXT (options)),
+                                  GIMP_LAYER_COLOR_SPACE_AUTO,
+                                  GIMP_LAYER_COLOR_SPACE_AUTO,
+                                  gimp_layer_mode_get_paint_composite_mode
+                                  (gimp_context_get_paint_mode (GIMP_CONTEXT (options))),
+                                  NULL, (gint) mask_x, mask_y);
+      g_object_unref (buffer);
+
+      gimp_drawable_update (drawable, mask_x, mask_y, width, height);
+    }
+
+  gimp_unset_busy (image->gimp);
+}
+
+/**
+ * gimp_drawable_get_bucket_fill_buffer:
+ * @drawable: the #GimpDrawable to edit.
+ * @options:
+ * @fill_transparent:
+ * @fill_criterion:
+ * @threshold:
+ * @show_all:
+ * @sample_merged:
+ * @diagonal_neighbors:
+ * @seed_x: X coordinate to start the fill.
+ * @seed_y: Y coordinate to start the fill.
+ * @mask_buffer: mask of the fill in-progress when in an interactive
+ *               filling process. Set to NULL if you need a one-time
+ *               fill.
+ * @mask_x: returned x bound of @mask_buffer.
+ * @mask_y: returned x bound of @mask_buffer.
+ * @mask_width: returned width bound of @mask_buffer.
+ * @mask_height: returned height bound of @mask_buffer.
+ *
+ * Creates the fill buffer for a bucket fill operation on @drawable,
+ * without actually applying it (if you want to apply it directly as a
+ * one-time operation, use gimp_drawable_bucket_fill() instead). If
+ * @mask_buffer is not NULL, the intermediate fill mask will also be
+ * returned. This fill mask can later be reused in successive calls to
+ * gimp_drawable_get_bucket_fill_buffer() for interactive filling.
+ *
+ * Returns: a fill buffer which can be directly applied to @drawable, or
+ *          used in a drawable filter as preview.
+ */
+GeglBuffer *
+gimp_drawable_get_bucket_fill_buffer (GimpDrawable         *drawable,
+                                      GimpFillOptions      *options,
+                                      gboolean              fill_transparent,
+                                      GimpSelectCriterion   fill_criterion,
+                                      gdouble               threshold,
+                                      gboolean              show_all,
+                                      gboolean              sample_merged,
+                                      gboolean              diagonal_neighbors,
+                                      gdouble               seed_x,
+                                      gdouble               seed_y,
+                                      GeglBuffer          **mask_buffer,
+                                      gdouble              *mask_x,
+                                      gdouble              *mask_y,
+                                      gint                 *mask_width,
+                                      gint                 *mask_height)
+{
+  GimpImage    *image;
+  GimpPickable *pickable;
+  GeglBuffer   *buffer;
+  GeglBuffer   *new_mask;
+  gboolean      antialias;
+  gint          x, y, width, height;
+  gint          mask_offset_x = 0;
+  gint          mask_offset_y = 0;
+  gint          sel_x, sel_y, sel_width, sel_height;
+
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)), NULL);
+  g_return_val_if_fail (GIMP_IS_FILL_OPTIONS (options), NULL);
+
+  image = gimp_item_get_image (GIMP_ITEM (drawable));
+
+  if (! gimp_item_mask_intersect (GIMP_ITEM (drawable),
+                                  &sel_x, &sel_y, &sel_width, &sel_height))
+    return NULL;
+
+  if (mask_buffer && *mask_buffer && threshold == 0.0)
+    {
+      gfloat pixel;
+
+      gegl_buffer_sample (*mask_buffer, seed_x, seed_y, NULL, &pixel,
+                          babl_format ("Y float"),
+                          GEGL_SAMPLER_NEAREST, GEGL_ABYSS_NONE);
+
+      if (pixel != 0.0)
+        /* Already selected. This seed won't change the selection. */
+        return NULL;
+    }
+
+  gimp_set_busy (image->gimp);
+
+  if (sample_merged)
+    {
+      if (! show_all)
+        pickable = GIMP_PICKABLE (image);
+      else
+        pickable = GIMP_PICKABLE (gimp_image_get_projection (image));
+    }
+  else
+    {
+      pickable = GIMP_PICKABLE (drawable);
+    }
+
+  antialias = gimp_fill_options_get_antialias (options);
+
+  /*  Do a seed bucket fill...To do this, calculate a new
+   *  contiguous region.
+   */
+  new_mask = gimp_pickable_contiguous_region_by_seed (pickable,
+                                                      antialias,
+                                                      threshold,
+                                                      fill_transparent,
+                                                      fill_criterion,
+                                                      diagonal_neighbors,
+                                                      (gint) seed_x,
+                                                      (gint) seed_y);
+  if (mask_buffer && *mask_buffer)
+    {
+      gimp_gegl_mask_combine_buffer (new_mask, *mask_buffer,
+                                     GIMP_CHANNEL_OP_ADD, 0, 0);
+      g_object_unref (*mask_buffer);
+    }
+
+  if (mask_buffer)
+    *mask_buffer = new_mask;
+
+  gimp_gegl_mask_bounds (new_mask, &x, &y, &width, &height);
+  width  -= x;
+  height -= y;
+
+  /*  If there is a selection, intersect the region bounds
+   *  with the selection bounds, to avoid processing areas
+   *  that are going to be masked out anyway.  The actual
+   *  intersection of the fill region with the mask data
+   *  happens when combining the fill buffer, in
+   *  gimp_drawable_apply_buffer().
+   */
+  if (! gimp_channel_is_empty (gimp_image_get_mask (image)))
+    {
+      gint off_x = 0;
+      gint off_y = 0;
+
+      if (sample_merged)
+        gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
+
+      if (! gimp_rectangle_intersect (x, y, width, height,
+
+                                      sel_x + off_x, sel_y + off_y,
+                                      sel_width,     sel_height,
+
+                                      &x, &y, &width, &height))
+        {
+          /*  The fill region and the selection are disjoint; bail.  */
+
+          if (! mask_buffer)
+            g_object_unref (new_mask);
+
+          gimp_unset_busy (image->gimp);
+
+          return NULL;
+        }
+    }
+
+  /*  make sure we handle the mask correctly if it was sample-merged  */
+  if (sample_merged)
+    {
+      GimpItem *item = GIMP_ITEM (drawable);
+      gint      off_x, off_y;
+
+      /*  Limit the channel bounds to the drawable's extents  */
+      gimp_item_get_offset (item, &off_x, &off_y);
+
+      gimp_rectangle_intersect (x, y, width, height,
+
+                                off_x, off_y,
+                                gimp_item_get_width (item),
+                                gimp_item_get_height (item),
+
+                                &x, &y, &width, &height);
+
+      mask_offset_x = x;
+      mask_offset_y = y;
+
+      /*  translate mask bounds to drawable coords  */
+      x -= off_x;
+      y -= off_y;
+    }
+  else
+    {
+      mask_offset_x = x;
+      mask_offset_y = y;
+    }
+
+  buffer = gimp_fill_options_create_buffer (options, drawable,
+                                            GEGL_RECTANGLE (0, 0,
+                                                            width, height),
+                                            -x, -y);
+
+  gimp_gegl_apply_opacity (buffer, NULL, NULL, buffer, new_mask,
+                           -mask_offset_x, -mask_offset_y, 1.0);
+
+  if (mask_x)
+    *mask_x = x;
+  if (mask_y)
+    *mask_y = y;
+  if (mask_width)
+    *mask_width = width;
+  if (mask_height)
+    *mask_height = height;
+
+  if (! mask_buffer)
+    g_object_unref (new_mask);
+
+  gimp_unset_busy (image->gimp);
+
+  return buffer;
+}
+
+/**
+ * gimp_drawable_get_line_art_fill_buffer:
+ * @drawable: the #GimpDrawable to edit.
+ * @line_art: the #GimpLineArt computed as fill source.
+ * @options: the #GimpFillOptions.
+ * @sample_merged:
+ * @seed_x: X coordinate to start the fill.
+ * @seed_y: Y coordinate to start the fill.
+ * @mask_buffer: mask of the fill in-progress when in an interactive
+ *               filling process. Set to NULL if you need a one-time
+ *               fill.
+ * @mask_x: returned x bound of @mask_buffer.
+ * @mask_y: returned x bound of @mask_buffer.
+ * @mask_width: returned width bound of @mask_buffer.
+ * @mask_height: returned height bound of @mask_buffer.
+ *
+ * Creates the fill buffer for a bucket fill operation on @drawable
+ * based on @line_art and @options, without actually applying it.
+ * If @mask_buffer is not NULL, the intermediate fill mask will also be
+ * returned. This fill mask can later be reused in successive calls to
+ * gimp_drawable_get_bucket_fill_buffer() for interactive filling.
+ *
+ * Returns: a fill buffer which can be directly applied to @drawable, or
+ *          used in a drawable filter as preview.
+ */
+GeglBuffer *
+gimp_drawable_get_line_art_fill_buffer (GimpDrawable     *drawable,
+                                        GimpLineArt      *line_art,
+                                        GimpFillOptions  *options,
+                                        gboolean          sample_merged,
+                                        gdouble           seed_x,
+                                        gdouble           seed_y,
+                                        GeglBuffer      **mask_buffer,
+                                        gdouble          *mask_x,
+                                        gdouble          *mask_y,
+                                        gint             *mask_width,
+                                        gint             *mask_height)
+{
+  GimpImage  *image;
+  GeglBuffer *buffer;
+  GeglBuffer *new_mask;
+  gint        x, y, width, height;
+  gint        mask_offset_x = 0;
+  gint        mask_offset_y = 0;
+  gint        sel_x, sel_y, sel_width, sel_height;
+  gdouble     feather_radius;
+
+  g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
+  g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)), NULL);
+  g_return_val_if_fail (GIMP_IS_FILL_OPTIONS (options), NULL);
+
+  image = gimp_item_get_image (GIMP_ITEM (drawable));
+
+  if (! gimp_item_mask_intersect (GIMP_ITEM (drawable),
+                                  &sel_x, &sel_y, &sel_width, &sel_height))
+    return NULL;
+
+  if (mask_buffer && *mask_buffer)
+    {
+      gfloat pixel;
+
+      gegl_buffer_sample (*mask_buffer, seed_x, seed_y, NULL, &pixel,
+                          babl_format ("Y float"),
+                          GEGL_SAMPLER_NEAREST, GEGL_ABYSS_NONE);
+
+      if (pixel != 0.0)
+        /* Already selected. This seed won't change the selection. */
+        return NULL;
+    }
+
+  gimp_set_busy (image->gimp);
+
+  /*  Do a seed bucket fill...To do this, calculate a new
+   *  contiguous region.
+   */
+  new_mask = gimp_pickable_contiguous_region_by_line_art (NULL, line_art,
+                                                          (gint) seed_x,
+                                                          (gint) seed_y);
+  if (mask_buffer && *mask_buffer)
+    {
+      gimp_gegl_mask_combine_buffer (new_mask, *mask_buffer,
+                                     GIMP_CHANNEL_OP_ADD, 0, 0);
+      g_object_unref (*mask_buffer);
+    }
+  if (mask_buffer)
+    *mask_buffer = new_mask;
+
+  gimp_gegl_mask_bounds (new_mask, &x, &y, &width, &height);
+  width  -= x;
+  height -= y;
+
+  /*  If there is a selection, intersect the region bounds
+   *  with the selection bounds, to avoid processing areas
+   *  that are going to be masked out anyway.  The actual
+   *  intersection of the fill region with the mask data
+   *  happens when combining the fill buffer, in
+   *  gimp_drawable_apply_buffer().
+   */
+  if (! gimp_channel_is_empty (gimp_image_get_mask (image)))
+    {
+      gint off_x = 0;
+      gint off_y = 0;
+
+      if (sample_merged)
+        gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
+
+      if (! gimp_rectangle_intersect (x, y, width, height,
+
+                                      sel_x + off_x, sel_y + off_y,
+                                      sel_width,     sel_height,
+
+                                      &x, &y, &width, &height))
+        {
+          if (! mask_buffer)
+            g_object_unref (new_mask);
+          /*  The fill region and the selection are disjoint; bail.  */
+          gimp_unset_busy (image->gimp);
+
+          return NULL;
+        }
+    }
+
+  /*  make sure we handle the mask correctly if it was sample-merged  */
+  if (sample_merged)
+    {
+      GimpItem *item = GIMP_ITEM (drawable);
+      gint      off_x, off_y;
+
+      /*  Limit the channel bounds to the drawable's extents  */
+      gimp_item_get_offset (item, &off_x, &off_y);
+
+      gimp_rectangle_intersect (x, y, width, height,
+
+                                off_x, off_y,
+                                gimp_item_get_width (item),
+                                gimp_item_get_height (item),
+
+                                &x, &y, &width, &height);
+
+      mask_offset_x = x;
+      mask_offset_y = y;
+
+      /*  translate mask bounds to drawable coords  */
+      x -= off_x;
+      y -= off_y;
+    }
+  else
+    {
+      mask_offset_x = x;
+      mask_offset_y = y;
+    }
+
+  buffer = gimp_fill_options_create_buffer (options, drawable,
+                                            GEGL_RECTANGLE (0, 0,
+                                                            width, height),
+                                            -x, -y);
+
+  gimp_gegl_apply_opacity (buffer, NULL, NULL, buffer, new_mask,
+                           -mask_offset_x, -mask_offset_y, 1.0);
+
+  if (gimp_fill_options_get_feather (options, &feather_radius))
+    {
+      /* Feathering for the line art algorithm is not applied during
+       * mask creation because we just want to apply it on the borders
+       * of the mask at the end (since the mask can evolve, we don't
+       * want to actually touch it, but only the intermediate results).
+       */
+      gimp_gegl_apply_feather (buffer, NULL, NULL, buffer, NULL,
+                               feather_radius, feather_radius, TRUE);
+    }
+
+  if (mask_x)
+    *mask_x = x;
+  if (mask_y)
+    *mask_y = y;
+  if (mask_width)
+    *mask_width = width;
+  if (mask_height)
+    *mask_height = height;
+
+  if (! mask_buffer)
+    g_object_unref (new_mask);
+
+  gimp_unset_busy (image->gimp);
+
+  return buffer;
+}