[gimp] app: some files were missing from the previous commit
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app: some files were missing from the previous commit
- Date: Sun, 16 Jun 2019 15:06:56 +0000 (UTC)
commit 5160f516763c3cc3f5dd8ba090f0748978ca8908
Author: Michael Natterer <mitch gimp org>
Date: Sun Jun 16 17:06:08 2019 +0200
app: some files were missing from the previous commit
app/core/gimpchannel-select.c | 16 +++++++++++-----
app/core/gimpdrawable-bucket-fill.c | 2 +-
app/core/gimpselection.c | 4 +++-
3 files changed, 15 insertions(+), 7 deletions(-)
---
diff --git a/app/core/gimpchannel-select.c b/app/core/gimpchannel-select.c
index 370511d75a..b76280ed8b 100644
--- a/app/core/gimpchannel-select.c
+++ b/app/core/gimpchannel-select.c
@@ -82,7 +82,8 @@ gimp_channel_select_rectangle (GimpChannel *channel,
gimp_gegl_apply_feather (add_on, NULL, NULL, add_on, NULL,
feather_radius_x,
- feather_radius_y);
+ feather_radius_y,
+ TRUE);
gimp_channel_combine_buffer (channel, add_on, op, 0, 0);
g_object_unref (add_on);
@@ -130,7 +131,8 @@ gimp_channel_select_ellipse (GimpChannel *channel,
gimp_gegl_apply_feather (add_on, NULL, NULL, add_on, NULL,
feather_radius_x,
- feather_radius_y);
+ feather_radius_y,
+ TRUE);
gimp_channel_combine_buffer (channel, add_on, op, 0, 0);
g_object_unref (add_on);
@@ -182,7 +184,8 @@ gimp_channel_select_round_rect (GimpChannel *channel,
gimp_gegl_apply_feather (add_on, NULL, NULL, add_on, NULL,
feather_radius_x,
- feather_radius_y);
+ feather_radius_y,
+ TRUE);
gimp_channel_combine_buffer (channel, add_on, op, 0, 0);
g_object_unref (add_on);
@@ -234,7 +237,8 @@ gimp_channel_select_scan_convert (GimpChannel *channel,
if (feather)
gimp_gegl_apply_feather (add_on, NULL, NULL, add_on, NULL,
feather_radius_x,
- feather_radius_y);
+ feather_radius_y,
+ TRUE);
gimp_channel_combine_buffer (channel, add_on, op, 0, 0);
g_object_unref (add_on);
@@ -343,7 +347,8 @@ gimp_channel_select_buffer (GimpChannel *channel,
gimp_gegl_apply_feather (add_on2, NULL, NULL, add_on2, NULL,
feather_radius_x,
- feather_radius_y);
+ feather_radius_y,
+ TRUE);
gimp_channel_combine_buffer (channel, add_on2, op, 0, 0);
g_object_unref (add_on2);
@@ -446,6 +451,7 @@ gimp_channel_select_component (GimpChannel *channel,
gimp_channel_feather (add_on,
feather_radius_x,
feather_radius_y,
+ TRUE,
FALSE /* no undo */);
gimp_enum_get_value (GIMP_TYPE_CHANNEL_TYPE, component,
diff --git a/app/core/gimpdrawable-bucket-fill.c b/app/core/gimpdrawable-bucket-fill.c
index c41fa54a2e..fdea6473cb 100644
--- a/app/core/gimpdrawable-bucket-fill.c
+++ b/app/core/gimpdrawable-bucket-fill.c
@@ -468,7 +468,7 @@ gimp_drawable_get_line_art_fill_buffer (GimpDrawable *drawable,
* want to actually touch it, but only the intermediate results).
*/
gimp_gegl_apply_feather (buffer, NULL, NULL, buffer, NULL,
- feather_radius, feather_radius);
+ feather_radius, feather_radius, TRUE);
}
if (mask_x)
diff --git a/app/core/gimpselection.c b/app/core/gimpselection.c
index 183f3d8673..cd5753af6e 100644
--- a/app/core/gimpselection.c
+++ b/app/core/gimpselection.c
@@ -114,6 +114,7 @@ static gboolean gimp_selection_is_empty (GimpChannel *channel);
static void gimp_selection_feather (GimpChannel *channel,
gdouble radius_x,
gdouble radius_y,
+ gboolean edge_lock,
gboolean push_undo);
static void gimp_selection_sharpen (GimpChannel *channel,
gboolean push_undo);
@@ -510,10 +511,11 @@ static void
gimp_selection_feather (GimpChannel *channel,
gdouble radius_x,
gdouble radius_y,
+ gboolean edge_lock,
gboolean push_undo)
{
GIMP_CHANNEL_CLASS (parent_class)->feather (channel, radius_x, radius_y,
- push_undo);
+ edge_lock, push_undo);
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]