[gimp/pippin/linear-is-the-new-black] app: pass trc arguments to gimp_composite_blend

[Øyvind Kolås <ok src gnome org>]

commit 33f033bf51007a1cb1f5e4b896a89e2a6ae6c69a
Author: Øyvind Kolås <pippin gimp org>
Date:   Tue Jan 17 21:23:26 2017 +0100

    app: pass trc arguments to gimp_composite_blend

 app/operations/layer-modes/gimpoperationaddition.c |    4 ++--
 app/operations/layer-modes/gimpoperationburn.c     |    4 ++--
 .../layer-modes/gimpoperationdarkenonly.c          |    4 ++--
 .../layer-modes/gimpoperationdifference.c          |    4 ++--
 app/operations/layer-modes/gimpoperationdivide.c   |    4 ++--
 app/operations/layer-modes/gimpoperationdodge.c    |    4 ++--
 .../layer-modes/gimpoperationgrainextract.c        |    4 ++--
 .../layer-modes/gimpoperationgrainmerge.c          |    4 ++--
 .../layer-modes/gimpoperationhardlight.c           |    4 ++--
 app/operations/layer-modes/gimpoperationhsvcolor.c |    4 ++--
 app/operations/layer-modes/gimpoperationhsvhue.c   |    4 ++--
 .../layer-modes/gimpoperationhsvsaturation.c       |    4 ++--
 app/operations/layer-modes/gimpoperationhsvvalue.c |    4 ++--
 .../layer-modes/gimpoperationlchchroma.c           |    4 ++--
 app/operations/layer-modes/gimpoperationlchcolor.c |    4 ++--
 app/operations/layer-modes/gimpoperationlchhue.c   |    4 ++--
 .../layer-modes/gimpoperationlchlightness.c        |    4 ++--
 .../layer-modes/gimpoperationlightenonly.c         |    6 +++---
 app/operations/layer-modes/gimpoperationmultiply.c |    4 ++--
 app/operations/layer-modes/gimpoperationoverlay.c  |    4 ++--
 app/operations/layer-modes/gimpoperationscreen.c   |    4 ++--
 .../layer-modes/gimpoperationsoftlight.c           |    4 ++--
 app/operations/layer-modes/gimpoperationsubtract.c |    4 ++--
 23 files changed, 47 insertions(+), 47 deletions(-)
---
diff --git a/app/operations/layer-modes/gimpoperationaddition.c 
b/app/operations/layer-modes/gimpoperationaddition.c
index fc71773..cc87d9a 100644
--- a/app/operations/layer-modes/gimpoperationaddition.c
+++ b/app/operations/layer-modes/gimpoperationaddition.c
@@ -95,8 +95,8 @@ gimp_operation_addition_process_pixels (gfloat              *in,
 {
   gimp_composite_blend (
      in, layer, mask, out, opacity, samples,
-     GIMP_LAYER_BLEND_RGB_PERCEPTUAL,
-     GIMP_LAYER_BLEND_RGB_LINEAR,
+     blend_trc,
+     composite_trc,
      GIMP_LAYER_COMPOSITE_SRC_ATOP,
      blendfun_addition
      );
diff --git a/app/operations/layer-modes/gimpoperationburn.c b/app/operations/layer-modes/gimpoperationburn.c
index 7f56693..d0bc08b 100644
--- a/app/operations/layer-modes/gimpoperationburn.c
+++ b/app/operations/layer-modes/gimpoperationburn.c
@@ -95,8 +95,8 @@ gimp_operation_burn_process_pixels (gfloat              *in,
 {
   gimp_composite_blend (
      in, layer, mask, out, opacity, samples,
-     GIMP_LAYER_BLEND_RGB_PERCEPTUAL,
-     GIMP_LAYER_BLEND_RGB_LINEAR,
+     blend_trc,
+     composite_trc,
      GIMP_LAYER_COMPOSITE_SRC_ATOP,
      blendfun_burn
      );
diff --git a/app/operations/layer-modes/gimpoperationdarkenonly.c 
b/app/operations/layer-modes/gimpoperationdarkenonly.c
index 2e9aec5..7c7195d 100644
--- a/app/operations/layer-modes/gimpoperationdarkenonly.c
+++ b/app/operations/layer-modes/gimpoperationdarkenonly.c
@@ -94,8 +94,8 @@ gimp_operation_darken_only_process_pixels (gfloat              *in,
 {
   gimp_composite_blend (
      in, layer, mask, out, opacity, samples,
-     GIMP_LAYER_BLEND_RGB_LINEAR,
-     GIMP_LAYER_BLEND_RGB_LINEAR,
+     blend_trc,
+     composite_trc,
      GIMP_LAYER_COMPOSITE_SRC_ATOP,
      blendfun_darken_only
      );
diff --git a/app/operations/layer-modes/gimpoperationdifference.c 
b/app/operations/layer-modes/gimpoperationdifference.c
index 65d42da..98a5f6d 100644
--- a/app/operations/layer-modes/gimpoperationdifference.c
+++ b/app/operations/layer-modes/gimpoperationdifference.c
@@ -94,8 +94,8 @@ gimp_operation_difference_process_pixels (gfloat              *in,
 {
   gimp_composite_blend (
      in, layer, mask, out, opacity, samples,
-     GIMP_LAYER_BLEND_RGB_PERCEPTUAL,
-     GIMP_LAYER_BLEND_RGB_LINEAR,
+     blend_trc,
+     composite_trc,
      GIMP_LAYER_COMPOSITE_SRC_ATOP,
      blendfun_difference
      );
diff --git a/app/operations/layer-modes/gimpoperationdivide.c 
b/app/operations/layer-modes/gimpoperationdivide.c
index 9720ad3..dc6b39a 100644
--- a/app/operations/layer-modes/gimpoperationdivide.c
+++ b/app/operations/layer-modes/gimpoperationdivide.c
@@ -94,8 +94,8 @@ gimp_operation_divide_process_pixels (gfloat              *in,
 {
   gimp_composite_blend (
      in, layer, mask, out, opacity, samples,
-     GIMP_LAYER_BLEND_RGB_PERCEPTUAL,
-     GIMP_LAYER_BLEND_RGB_LINEAR,
+     blend_trc,
+     composite_trc,
      GIMP_LAYER_COMPOSITE_SRC_ATOP,
      blendfun_divide
      );
diff --git a/app/operations/layer-modes/gimpoperationdodge.c b/app/operations/layer-modes/gimpoperationdodge.c
index 8470f63..f3acfec 100644
--- a/app/operations/layer-modes/gimpoperationdodge.c
+++ b/app/operations/layer-modes/gimpoperationdodge.c
@@ -94,8 +94,8 @@ gimp_operation_dodge_process_pixels (gfloat              *in,
 {
   gimp_composite_blend (
      in, layer, mask, out, opacity, samples,
-     GIMP_LAYER_BLEND_RGB_PERCEPTUAL,
-     GIMP_LAYER_BLEND_RGB_LINEAR,
+     blend_trc,
+     composite_trc,
      GIMP_LAYER_COMPOSITE_SRC_ATOP,
      blendfun_dodge
      );
diff --git a/app/operations/layer-modes/gimpoperationgrainextract.c 
b/app/operations/layer-modes/gimpoperationgrainextract.c
index a2aaf1c..89ecda1 100644
--- a/app/operations/layer-modes/gimpoperationgrainextract.c
+++ b/app/operations/layer-modes/gimpoperationgrainextract.c
@@ -93,8 +93,8 @@ gimp_operation_grain_extract_process_pixels (gfloat              *in,
 {
   gimp_composite_blend (
      in, layer, mask, out, opacity, samples,
-     GIMP_LAYER_BLEND_RGB_PERCEPTUAL,
-     GIMP_LAYER_BLEND_RGB_LINEAR,
+     blend_trc,
+     composite_trc,
      GIMP_LAYER_COMPOSITE_SRC_ATOP,
      blendfun_grain_extract
      );
diff --git a/app/operations/layer-modes/gimpoperationgrainmerge.c 
b/app/operations/layer-modes/gimpoperationgrainmerge.c
index cb9cc15..354b9bb 100644
--- a/app/operations/layer-modes/gimpoperationgrainmerge.c
+++ b/app/operations/layer-modes/gimpoperationgrainmerge.c
@@ -93,8 +93,8 @@ gimp_operation_grain_merge_process_pixels (gfloat              *in,
 {
   gimp_composite_blend (
      in, layer, mask, out, opacity, samples,
-     GIMP_LAYER_BLEND_RGB_PERCEPTUAL,
-     GIMP_LAYER_BLEND_RGB_LINEAR,
+     blend_trc,
+     composite_trc,
      GIMP_LAYER_COMPOSITE_SRC_ATOP,
      blendfun_grain_merge
      );
diff --git a/app/operations/layer-modes/gimpoperationhardlight.c 
b/app/operations/layer-modes/gimpoperationhardlight.c
index 058c7cb..d9c8e2a 100644
--- a/app/operations/layer-modes/gimpoperationhardlight.c
+++ b/app/operations/layer-modes/gimpoperationhardlight.c
@@ -93,8 +93,8 @@ gimp_operation_hardlight_process_pixels (gfloat              *in,
 {
   gimp_composite_blend (
      in, layer, mask, out, opacity, samples,
-     GIMP_LAYER_BLEND_RGB_PERCEPTUAL,
-     GIMP_LAYER_BLEND_RGB_LINEAR,
+     blend_trc,
+     composite_trc,
      GIMP_LAYER_COMPOSITE_SRC_ATOP,
      blendfun_hardlight
      );
diff --git a/app/operations/layer-modes/gimpoperationhsvcolor.c 
b/app/operations/layer-modes/gimpoperationhsvcolor.c
index 6c5f2be..c022c57 100644
--- a/app/operations/layer-modes/gimpoperationhsvcolor.c
+++ b/app/operations/layer-modes/gimpoperationhsvcolor.c
@@ -98,8 +98,8 @@ gimp_operation_hsv_color_process_pixels (gfloat              *in,
 {
   gimp_composite_blend (
      in, layer, mask, out, opacity, samples,
-     GIMP_LAYER_BLEND_RGB_PERCEPTUAL,
-     GIMP_LAYER_BLEND_RGB_LINEAR,
+     blend_trc,
+     composite_trc,
      GIMP_LAYER_COMPOSITE_SRC_ATOP,
      blendfun_hsv_color
      );
diff --git a/app/operations/layer-modes/gimpoperationhsvhue.c 
b/app/operations/layer-modes/gimpoperationhsvhue.c
index 8dd555b..473544e 100644
--- a/app/operations/layer-modes/gimpoperationhsvhue.c
+++ b/app/operations/layer-modes/gimpoperationhsvhue.c
@@ -98,8 +98,8 @@ gimp_operation_hsv_hue_process_pixels (gfloat              *in,
 {
   gimp_composite_blend (
      in, layer, mask, out, opacity, samples,
-     GIMP_LAYER_BLEND_RGB_PERCEPTUAL,
-     GIMP_LAYER_BLEND_RGB_LINEAR,
+     blend_trc,
+     composite_trc,
      GIMP_LAYER_COMPOSITE_SRC_ATOP,
      blendfun_hsv_hue
      );
diff --git a/app/operations/layer-modes/gimpoperationhsvsaturation.c 
b/app/operations/layer-modes/gimpoperationhsvsaturation.c
index b00aa91..20b6f68 100644
--- a/app/operations/layer-modes/gimpoperationhsvsaturation.c
+++ b/app/operations/layer-modes/gimpoperationhsvsaturation.c
@@ -97,8 +97,8 @@ gimp_operation_hsv_saturation_process_pixels (gfloat              *in,
 {
   gimp_composite_blend (
      in, layer, mask, out, opacity, samples,
-     GIMP_LAYER_BLEND_RGB_PERCEPTUAL,
-     GIMP_LAYER_BLEND_RGB_LINEAR,
+     blend_trc,
+     composite_trc,
      GIMP_LAYER_COMPOSITE_SRC_ATOP,
      blendfun_hsv_saturation
      );
diff --git a/app/operations/layer-modes/gimpoperationhsvvalue.c 
b/app/operations/layer-modes/gimpoperationhsvvalue.c
index 253ec2f..3b829e5 100644
--- a/app/operations/layer-modes/gimpoperationhsvvalue.c
+++ b/app/operations/layer-modes/gimpoperationhsvvalue.c
@@ -97,8 +97,8 @@ gimp_operation_hsv_value_process_pixels (gfloat              *in,
 {
   gimp_composite_blend (
      in, layer, mask, out, opacity, samples,
-     GIMP_LAYER_BLEND_RGB_PERCEPTUAL,
-     GIMP_LAYER_BLEND_RGB_LINEAR,
+     blend_trc,
+     composite_trc,
      GIMP_LAYER_COMPOSITE_SRC_ATOP,
      blendfun_hsv_value
      );
diff --git a/app/operations/layer-modes/gimpoperationlchchroma.c 
b/app/operations/layer-modes/gimpoperationlchchroma.c
index 5b9f9ff..597feab 100644
--- a/app/operations/layer-modes/gimpoperationlchchroma.c
+++ b/app/operations/layer-modes/gimpoperationlchchroma.c
@@ -163,8 +163,8 @@ gimp_operation_lch_chroma_process_pixels_linear (gfloat              *in,
 {
   gimp_composite_blend (
      in, layer, mask, out, opacity, samples,
-     GIMP_LAYER_BLEND_LAB,
-     GIMP_LAYER_BLEND_RGB_LINEAR,
+     blend_trc,
+     composite_trc,
      GIMP_LAYER_COMPOSITE_SRC_ATOP,
      blendfun_lch_chroma
      );
diff --git a/app/operations/layer-modes/gimpoperationlchcolor.c 
b/app/operations/layer-modes/gimpoperationlchcolor.c
index e1e9314..6733dc6 100644
--- a/app/operations/layer-modes/gimpoperationlchcolor.c
+++ b/app/operations/layer-modes/gimpoperationlchcolor.c
@@ -155,8 +155,8 @@ gimp_operation_lch_color_process_pixels_linear (gfloat              *in,
 {
   gimp_composite_blend (
      in, layer, mask, out, opacity, samples,
-     GIMP_LAYER_BLEND_LAB,
-     GIMP_LAYER_BLEND_RGB_LINEAR,
+     blend_trc,
+     composite_trc,
      GIMP_LAYER_COMPOSITE_SRC_ATOP,
      blendfun_lch_color
      );
diff --git a/app/operations/layer-modes/gimpoperationlchhue.c 
b/app/operations/layer-modes/gimpoperationlchhue.c
index e5b3112..e213168 100644
--- a/app/operations/layer-modes/gimpoperationlchhue.c
+++ b/app/operations/layer-modes/gimpoperationlchhue.c
@@ -163,8 +163,8 @@ gimp_operation_lch_hue_process_pixels_linear (gfloat              *in,
 {
   gimp_composite_blend (
      in, layer, mask, out, opacity, samples,
-     GIMP_LAYER_BLEND_LAB,
-     GIMP_LAYER_BLEND_RGB_LINEAR,
+     blend_trc,
+     composite_trc,
      GIMP_LAYER_COMPOSITE_SRC_ATOP,
      blendfun_lch_hue
      );
diff --git a/app/operations/layer-modes/gimpoperationlchlightness.c 
b/app/operations/layer-modes/gimpoperationlchlightness.c
index c544148..4dafb11 100644
--- a/app/operations/layer-modes/gimpoperationlchlightness.c
+++ b/app/operations/layer-modes/gimpoperationlchlightness.c
@@ -151,8 +151,8 @@ gimp_operation_lch_lightness_process_pixels_linear (gfloat              *in,
 {
   gimp_composite_blend (
      in, layer, mask, out, opacity, samples,
-     GIMP_LAYER_BLEND_LAB,
-     GIMP_LAYER_BLEND_RGB_LINEAR,
+     blend_trc,
+     composite_trc,
      GIMP_LAYER_COMPOSITE_SRC_ATOP,
      blendfun_lch_lightness
      );
diff --git a/app/operations/layer-modes/gimpoperationlightenonly.c 
b/app/operations/layer-modes/gimpoperationlightenonly.c
index ea428f3..89ecb21 100644
--- a/app/operations/layer-modes/gimpoperationlightenonly.c
+++ b/app/operations/layer-modes/gimpoperationlightenonly.c
@@ -90,12 +90,12 @@ gimp_operation_lighten_only_process_pixels (gfloat              *in,
                                             const GeglRectangle *roi,
                                             gint                 level,
                                             GimpLayerBlendTRC    blend_trc,
-                                            GimpLayerBlendTRC    composite_mode)
+                                            GimpLayerBlendTRC    composite_trc)
 {
   gimp_composite_blend (
      in, layer, mask, out, opacity, samples,
-     GIMP_LAYER_BLEND_RGB_LINEAR,
-     GIMP_LAYER_BLEND_RGB_LINEAR,
+     blend_trc,
+     composite_trc,
      GIMP_LAYER_COMPOSITE_SRC_ATOP,
      blendfun_lighten_only
      );
diff --git a/app/operations/layer-modes/gimpoperationmultiply.c 
b/app/operations/layer-modes/gimpoperationmultiply.c
index 15c089d..bca7376 100644
--- a/app/operations/layer-modes/gimpoperationmultiply.c
+++ b/app/operations/layer-modes/gimpoperationmultiply.c
@@ -94,8 +94,8 @@ gimp_operation_multiply_process_pixels (gfloat              *in,
 {
   gimp_composite_blend (
      in, layer, mask, out, opacity, samples,
-     GIMP_LAYER_BLEND_RGB_PERCEPTUAL,
-     GIMP_LAYER_BLEND_RGB_LINEAR,
+     blend_trc,
+     composite_trc,
      GIMP_LAYER_COMPOSITE_SRC_ATOP,
      blendfun_multiply
      );
diff --git a/app/operations/layer-modes/gimpoperationoverlay.c 
b/app/operations/layer-modes/gimpoperationoverlay.c
index a109ccb..24fae12 100644
--- a/app/operations/layer-modes/gimpoperationoverlay.c
+++ b/app/operations/layer-modes/gimpoperationoverlay.c
@@ -93,8 +93,8 @@ gimp_operation_overlay_process_pixels (gfloat              *in,
 {
   gimp_composite_blend (
      in, layer, mask, out, opacity, samples,
-     GIMP_LAYER_BLEND_RGB_PERCEPTUAL,
-     GIMP_LAYER_BLEND_RGB_LINEAR,
+     blend_trc,
+     composite_trc,
      GIMP_LAYER_COMPOSITE_SRC_ATOP,
      blendfun_overlay
      );
diff --git a/app/operations/layer-modes/gimpoperationscreen.c 
b/app/operations/layer-modes/gimpoperationscreen.c
index 529d81a..1948df0 100644
--- a/app/operations/layer-modes/gimpoperationscreen.c
+++ b/app/operations/layer-modes/gimpoperationscreen.c
@@ -94,8 +94,8 @@ gimp_operation_screen_process_pixels (gfloat              *in,
 {
   gimp_composite_blend (
      in, layer, mask, out, opacity, samples,
-     GIMP_LAYER_BLEND_RGB_PERCEPTUAL,
-     GIMP_LAYER_BLEND_RGB_LINEAR,
+     blend_trc,
+     composite_trc,
      GIMP_LAYER_COMPOSITE_SRC_ATOP,
      blendfun_screen
      );
diff --git a/app/operations/layer-modes/gimpoperationsoftlight.c 
b/app/operations/layer-modes/gimpoperationsoftlight.c
index 4497dd8..a3521b2 100644
--- a/app/operations/layer-modes/gimpoperationsoftlight.c
+++ b/app/operations/layer-modes/gimpoperationsoftlight.c
@@ -110,8 +110,8 @@ gimp_operation_softlight_process_pixels (gfloat              *in,
 {
   gimp_composite_blend (
      in, layer, mask, out, opacity, samples,
-     GIMP_LAYER_BLEND_RGB_PERCEPTUAL,
-     GIMP_LAYER_BLEND_RGB_LINEAR,
+     blend_trc,
+     composite_trc,
      GIMP_LAYER_COMPOSITE_SRC_ATOP,
      blendfun_softlight
      );
diff --git a/app/operations/layer-modes/gimpoperationsubtract.c 
b/app/operations/layer-modes/gimpoperationsubtract.c
index c22e125..780d59b 100644
--- a/app/operations/layer-modes/gimpoperationsubtract.c
+++ b/app/operations/layer-modes/gimpoperationsubtract.c
@@ -94,8 +94,8 @@ gimp_operation_subtract_process_pixels (gfloat              *in,
 {
   gimp_composite_blend (
      in, layer, mask, out, opacity, samples,
-     GIMP_LAYER_BLEND_RGB_PERCEPTUAL,
-     GIMP_LAYER_BLEND_RGB_LINEAR,
+     blend_trc,
+     composite_trc,
      GIMP_LAYER_COMPOSITE_SRC_ATOP,
      blendfun_subtract
      );