dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Bug 791512 - make the selection boundary detection the same as 2.8" 

This commit was fixing only a symptom of our channel/selection
problem, making it appear things were fine.

This reverts commit 27512d802b.
This commit is contained in:
Michael Natterer 2018-04-10 00:26:01 +02:00
parent 54ca0a7f68
commit bba8f69594
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/core/gimpboundary.h
View File

@ -20,8 +20,7 @@
/* half intensity for mask */
#define GIMP_BOUNDARY_HALF_WAY_PERCEPTUAL 0.5
#define GIMP_BOUNDARY_HALF_WAY_LINEAR 0.214041
#define GIMP_BOUNDARY_HALF_WAY 0.5
typedef enum

4
app/core/gimpchannel.c
View File

@ -1088,7 +1088,7 @@ gimp_channel_real_boundary (GimpChannel *channel,
babl_format ("Y float"),
GIMP_BOUNDARY_IGNORE_BOUNDS,
x1, y1, x2, y2,
GIMP_BOUNDARY_HALF_WAY_LINEAR,
GIMP_BOUNDARY_HALF_WAY,
&channel->num_segs_out);
x1 = MAX (x1, x3);
y1 = MAX (y1, y3);
@ -1101,7 +1101,7 @@ gimp_channel_real_boundary (GimpChannel *channel,
babl_format ("Y float"),
GIMP_BOUNDARY_WITHIN_BOUNDS,
x1, y1, x2, y2,
GIMP_BOUNDARY_HALF_WAY_LINEAR,
GIMP_BOUNDARY_HALF_WAY,
&channel->num_segs_in);
}
else

2
app/core/gimplayer-floating-selection.c
View File

@ -267,7 +267,7 @@ floating_sel_boundary (GimpLayer *layer,
babl_format ("A float"),
GIMP_BOUNDARY_WITHIN_BOUNDS,
0, 0, width, height,
GIMP_BOUNDARY_HALF_WAY_LINEAR,
GIMP_BOUNDARY_HALF_WAY,
&layer->fs.num_segs);
/* offset the segments */

2
app/tools/gimpregionselecttool.c
View File

@ -310,7 +310,7 @@ gimp_region_select_tool_draw (GimpDrawTool *draw_tool)
0, 0,
gegl_buffer_get_width (region_sel->region_mask),
gegl_buffer_get_height (region_sel->region_mask),
GIMP_BOUNDARY_HALF_WAY_LINEAR,
GIMP_BOUNDARY_HALF_WAY,
&region_sel->n_segs);
}