[gimp] app: normalize some layer mode alpha/opacity handling



commit 03185f80706c6d1bbfe2630922e2eee6be215d2e
Author: Øyvind Kolås <pippin gimp org>
Date:   Fri Jan 6 04:50:41 2017 +0100

    app: normalize some layer mode alpha/opacity handling
    
    Make overlay, Lch color, Lch hue, Lch saturation and Lch lightness mode handle
    alpha more like how normal does it. This is a change that we ideally might want
    applied to other layer modes as well to get rid of MIN() calls.

 app/operations/gimpoperationlchchromamode.c    |    2 +-
 app/operations/gimpoperationlchcolormode.c     |    2 +-
 app/operations/gimpoperationlchhuemode.c       |    2 +-
 app/operations/gimpoperationlchlightnessmode.c |    2 +-
 app/operations/gimpoperationoverlaymode.c      |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/app/operations/gimpoperationlchchromamode.c b/app/operations/gimpoperationlchchromamode.c
index b4dd037..632bf3f 100644
--- a/app/operations/gimpoperationlchchromamode.c
+++ b/app/operations/gimpoperationlchchromamode.c
@@ -139,7 +139,7 @@ chroma_post_process (const gfloat *in,
     {
       gfloat comp_alpha, new_alpha;
 
-      comp_alpha = MIN (in[ALPHA], layer[ALPHA]) * opacity;
+      comp_alpha = layer[ALPHA] * opacity;
       if (mask)
         comp_alpha *= *mask++;
 
diff --git a/app/operations/gimpoperationlchcolormode.c b/app/operations/gimpoperationlchcolormode.c
index 4344877..ee14a13 100644
--- a/app/operations/gimpoperationlchcolormode.c
+++ b/app/operations/gimpoperationlchcolormode.c
@@ -128,7 +128,7 @@ color_post_process (const gfloat *in,
     {
       gfloat comp_alpha, new_alpha;
 
-      comp_alpha = MIN (in[ALPHA], layer[ALPHA]) * opacity;
+      comp_alpha = layer[ALPHA] * opacity;
       if (mask)
         comp_alpha *= *mask++;
 
diff --git a/app/operations/gimpoperationlchhuemode.c b/app/operations/gimpoperationlchhuemode.c
index fe7d1b4..1fae4f9 100644
--- a/app/operations/gimpoperationlchhuemode.c
+++ b/app/operations/gimpoperationlchhuemode.c
@@ -139,7 +139,7 @@ hue_post_process (const gfloat *in,
     {
       gfloat comp_alpha, new_alpha;
 
-      comp_alpha = MIN (in[ALPHA], layer[ALPHA]) * opacity;
+      comp_alpha = layer[ALPHA] * opacity;
       if (mask)
         comp_alpha *= *mask++;
 
diff --git a/app/operations/gimpoperationlchlightnessmode.c b/app/operations/gimpoperationlchlightnessmode.c
index 3c7f44f..79492a5 100644
--- a/app/operations/gimpoperationlchlightnessmode.c
+++ b/app/operations/gimpoperationlchlightnessmode.c
@@ -122,7 +122,7 @@ lightness_post_process (const gfloat *in,
     {
       gfloat comp_alpha, new_alpha;
 
-      comp_alpha = MIN (in[ALPHA], layer[ALPHA]) * opacity;
+      comp_alpha = layer[ALPHA] * opacity;
       if (mask)
         comp_alpha *= *mask++;
 
diff --git a/app/operations/gimpoperationoverlaymode.c b/app/operations/gimpoperationoverlaymode.c
index cb7e573..e808e2e 100644
--- a/app/operations/gimpoperationoverlaymode.c
+++ b/app/operations/gimpoperationoverlaymode.c
@@ -95,7 +95,7 @@ gimp_operation_overlay_mode_process_pixels (gfloat              *in,
     {
       gfloat comp_alpha, new_alpha;
 
-      comp_alpha = MIN (in[ALPHA], layer[ALPHA]) * opacity;
+      comp_alpha = layer[ALPHA] * opacity;
       if (has_mask)
         comp_alpha *= *mask;
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]