callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app: change mask handling in GimpOperationReplaceMode

Browse Source 
to be like in the other modes, and proably speed it up a little.
This commit is contained in:
Michael Natterer
2017-01-11 12:38:58 +01:00
parent 7ed2857695
commit 01b25baffd
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/operations/gimpoperationreplacemode.c
View File

@ -88,24 +88,22 @@ gimp_operation_replace_mode_process_pixels (gfloat *in,
const GeglRectangle *roi,
gint level)
{
const gboolean has_mask = mask != NULL;
while (samples--)
{
gint b;
gfloat opacity_value = opacity;
gfloat new_alpha;
gint b;
if (mask)
new_alpha = (layer[ALPHA] - in[ALPHA]) * (*mask) * opacity + in[ALPHA];
else
new_alpha = (layer[ALPHA] - in[ALPHA]) * opacity + in[ALPHA];
if (has_mask)
opacity_value *= *mask;
new_alpha = (layer[ALPHA] - in[ALPHA]) * opacity_value + in[ALPHA];
if (new_alpha)
{
gfloat ratio;
if (mask)
ratio = *mask * opacity * layer[ALPHA] / new_alpha;
else
ratio = opacity * layer[ALPHA] / new_alpha;
gfloat ratio = opacity_value * layer[ALPHA] / new_alpha;
for (b = RED; b < ALPHA; b++)
{
@ -135,8 +133,8 @@ gimp_operation_replace_mode_process_pixels (gfloat *in,
layer += 4;
out += 4;
if (mask)
mask += 1;
if (has_mask)
mask++;
}
return TRUE;