[gimp] app: rename GimpLayerBlendTRC to GimpLayerColorSpace
- From: Øyvind Kolås <ok src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app: rename GimpLayerBlendTRC to GimpLayerColorSpace
- Date: Thu, 19 Jan 2017 19:15:11 +0000 (UTC)
commit 386e18e510bc3f7c684e5fa1d4efd23dc2f54e87
Author: Øyvind Kolås <pippin gimp org>
Date: Thu Jan 19 20:12:45 2017 +0100
app: rename GimpLayerBlendTRC to GimpLayerColorSpace
It is used both for blending and compositing, the repeated use of the word
BLEND in code made the logic involving both blending and compositing hard to
read.
app/core/gimp-layer-modes.c | 34 ++++++++++----------
app/core/gimp-layer-modes.h | 12 +++---
.../gimpoperationadditionlegacy.c | 4 +-
.../gimpoperationadditionlegacy.h | 4 +-
.../layer-modes-legacy/gimpoperationburnlegacy.c | 4 +-
.../layer-modes-legacy/gimpoperationburnlegacy.h | 4 +-
.../gimpoperationdarkenonlylegacy.c | 4 +-
.../gimpoperationdarkenonlylegacy.h | 4 +-
.../gimpoperationdifferencelegacy.c | 4 +-
.../gimpoperationdifferencelegacy.h | 4 +-
.../layer-modes-legacy/gimpoperationdividelegacy.c | 4 +-
.../layer-modes-legacy/gimpoperationdividelegacy.h | 4 +-
.../layer-modes-legacy/gimpoperationdodgelegacy.c | 4 +-
.../layer-modes-legacy/gimpoperationdodgelegacy.h | 4 +-
.../gimpoperationgrainextractlegacy.c | 4 +-
.../gimpoperationgrainextractlegacy.h | 4 +-
.../gimpoperationgrainmergelegacy.c | 4 +-
.../gimpoperationgrainmergelegacy.h | 4 +-
.../gimpoperationhardlightlegacy.c | 4 +-
.../gimpoperationhardlightlegacy.h | 4 +-
.../gimpoperationhsvcolorlegacy.c | 4 +-
.../gimpoperationhsvcolorlegacy.h | 4 +-
.../layer-modes-legacy/gimpoperationhsvhuelegacy.c | 4 +-
.../layer-modes-legacy/gimpoperationhsvhuelegacy.h | 4 +-
.../gimpoperationhsvsaturationlegacy.h | 4 +-
.../gimpoperationhsvvaluelegacy.h | 4 +-
.../gimpoperationlightenonlylegacy.h | 4 +-
.../gimpoperationmultiplylegacy.h | 4 +-
.../layer-modes-legacy/gimpoperationscreenlegacy.h | 4 +-
.../gimpoperationsoftlightlegacy.h | 4 +-
.../gimpoperationsubtractlegacy.h | 4 +-
app/operations/layer-modes/gimpblendcomposite.h | 30 +++++++++---------
app/operations/layer-modes/gimpoperationaddition.c | 4 +-
app/operations/layer-modes/gimpoperationaddition.h | 4 +-
.../layer-modes/gimpoperationantierase.c | 4 +-
.../layer-modes/gimpoperationantierase.h | 4 +-
app/operations/layer-modes/gimpoperationbehind.c | 4 +-
app/operations/layer-modes/gimpoperationbehind.h | 4 +-
app/operations/layer-modes/gimpoperationburn.c | 4 +-
app/operations/layer-modes/gimpoperationburn.h | 4 +-
.../layer-modes/gimpoperationcolorerase.c | 4 +-
.../layer-modes/gimpoperationcolorerase.h | 4 +-
.../layer-modes/gimpoperationdarkenonly.c | 4 +-
.../layer-modes/gimpoperationdarkenonly.h | 4 +-
.../layer-modes/gimpoperationdifference.c | 4 +-
.../layer-modes/gimpoperationdifference.h | 4 +-
app/operations/layer-modes/gimpoperationdissolve.c | 4 +-
app/operations/layer-modes/gimpoperationdissolve.h | 4 +-
app/operations/layer-modes/gimpoperationdivide.c | 4 +-
app/operations/layer-modes/gimpoperationdivide.h | 4 +-
app/operations/layer-modes/gimpoperationdodge.c | 4 +-
app/operations/layer-modes/gimpoperationdodge.h | 4 +-
app/operations/layer-modes/gimpoperationerase.c | 4 +-
app/operations/layer-modes/gimpoperationerase.h | 4 +-
.../layer-modes/gimpoperationgrainextract.c | 4 +-
.../layer-modes/gimpoperationgrainextract.h | 4 +-
.../layer-modes/gimpoperationgrainmerge.c | 4 +-
.../layer-modes/gimpoperationgrainmerge.h | 4 +-
.../layer-modes/gimpoperationhardlight.c | 4 +-
.../layer-modes/gimpoperationhardlight.h | 4 +-
app/operations/layer-modes/gimpoperationhsvcolor.c | 4 +-
app/operations/layer-modes/gimpoperationhsvcolor.h | 4 +-
app/operations/layer-modes/gimpoperationhsvhue.c | 4 +-
app/operations/layer-modes/gimpoperationhsvhue.h | 4 +-
.../layer-modes/gimpoperationhsvsaturation.c | 4 +-
.../layer-modes/gimpoperationhsvsaturation.h | 4 +-
app/operations/layer-modes/gimpoperationhsvvalue.c | 4 +-
app/operations/layer-modes/gimpoperationhsvvalue.h | 4 +-
.../layer-modes/gimpoperationlchchroma.c | 4 +-
.../layer-modes/gimpoperationlchchroma.h | 4 +-
app/operations/layer-modes/gimpoperationlchcolor.c | 4 +-
app/operations/layer-modes/gimpoperationlchcolor.h | 4 +-
app/operations/layer-modes/gimpoperationlchhue.c | 4 +-
app/operations/layer-modes/gimpoperationlchhue.h | 4 +-
.../layer-modes/gimpoperationlchlightness.c | 4 +-
.../layer-modes/gimpoperationlchlightness.h | 4 +-
.../layer-modes/gimpoperationlightenonly.c | 4 +-
.../layer-modes/gimpoperationlightenonly.h | 4 +-
app/operations/layer-modes/gimpoperationmultiply.c | 4 +-
app/operations/layer-modes/gimpoperationmultiply.h | 4 +-
.../layer-modes/gimpoperationnormal-sse2.c | 4 +-
.../layer-modes/gimpoperationnormal-sse4.c | 4 +-
app/operations/layer-modes/gimpoperationnormal.c | 4 +-
app/operations/layer-modes/gimpoperationnormal.h | 12 +++---
app/operations/layer-modes/gimpoperationoverlay.c | 4 +-
app/operations/layer-modes/gimpoperationoverlay.h | 4 +-
.../layer-modes/gimpoperationpointlayermode.c | 8 ++--
.../layer-modes/gimpoperationpointlayermode.h | 4 +-
app/operations/layer-modes/gimpoperationreplace.c | 4 +-
app/operations/layer-modes/gimpoperationreplace.h | 4 +-
app/operations/layer-modes/gimpoperationscreen.c | 4 +-
app/operations/layer-modes/gimpoperationscreen.h | 4 +-
.../layer-modes/gimpoperationsoftlight.c | 4 +-
.../layer-modes/gimpoperationsoftlight.h | 4 +-
app/operations/layer-modes/gimpoperationsubtract.c | 4 +-
app/operations/layer-modes/gimpoperationsubtract.h | 4 +-
app/operations/operations-enums.h | 12 +++---
app/operations/operations-types.h | 4 +-
98 files changed, 238 insertions(+), 238 deletions(-)
---
diff --git a/app/core/gimp-layer-modes.c b/app/core/gimp-layer-modes.c
index 23e4759..24bc738 100644
--- a/app/core/gimp-layer-modes.c
+++ b/app/core/gimp-layer-modes.c
@@ -160,19 +160,19 @@ gimp_layer_mode_is_linear (GimpLayerMode mode)
return FALSE;
}
-GimpLayerBlendTRC
-gimp_layer_mode_get_blend_trc (GimpLayerMode mode)
+GimpLayerColorSpace
+gimp_layer_mode_get_blend_space (GimpLayerMode mode)
{
switch (mode)
{
case GIMP_LAYER_MODE_NORMAL_NON_LINEAR:
- return GIMP_LAYER_BLEND_RGB_PERCEPTUAL;
+ return GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL;
case GIMP_LAYER_MODE_DISSOLVE:
- return GIMP_LAYER_BLEND_RGB_LINEAR;
+ return GIMP_LAYER_COLOR_SPACE_RGB_LINEAR;
case GIMP_LAYER_MODE_BEHIND:
- return GIMP_LAYER_BLEND_RGB_PERCEPTUAL;
+ return GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL;
case GIMP_LAYER_MODE_MULTIPLY_LEGACY:
case GIMP_LAYER_MODE_SCREEN_LEGACY:
@@ -197,16 +197,16 @@ gimp_layer_mode_get_blend_trc (GimpLayerMode mode)
case GIMP_LAYER_MODE_COLOR_ERASE:
case GIMP_LAYER_MODE_OVERLAY:
- return GIMP_LAYER_BLEND_RGB_PERCEPTUAL;
+ return GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL;
case GIMP_LAYER_MODE_LCH_HUE:
case GIMP_LAYER_MODE_LCH_CHROMA:
case GIMP_LAYER_MODE_LCH_COLOR:
case GIMP_LAYER_MODE_LCH_LIGHTNESS:
- return GIMP_LAYER_BLEND_LAB;
+ return GIMP_LAYER_COLOR_SPACE_LAB;
case GIMP_LAYER_MODE_NORMAL:
- return GIMP_LAYER_BLEND_RGB_LINEAR;
+ return GIMP_LAYER_COLOR_SPACE_RGB_LINEAR;
case GIMP_LAYER_MODE_MULTIPLY:
case GIMP_LAYER_MODE_SCREEN:
@@ -226,7 +226,7 @@ gimp_layer_mode_get_blend_trc (GimpLayerMode mode)
case GIMP_LAYER_MODE_SOFTLIGHT:
case GIMP_LAYER_MODE_GRAIN_EXTRACT:
case GIMP_LAYER_MODE_GRAIN_MERGE:
- return GIMP_LAYER_BLEND_RGB_PERCEPTUAL;
+ return GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL;
case GIMP_LAYER_MODE_BEHIND_LINEAR:
case GIMP_LAYER_MODE_MULTIPLY_LINEAR:
@@ -244,25 +244,25 @@ gimp_layer_mode_get_blend_trc (GimpLayerMode mode)
case GIMP_LAYER_MODE_SOFTLIGHT_LINEAR:
case GIMP_LAYER_MODE_GRAIN_EXTRACT_LINEAR:
case GIMP_LAYER_MODE_GRAIN_MERGE_LINEAR:
- return GIMP_LAYER_BLEND_RGB_LINEAR;
+ return GIMP_LAYER_COLOR_SPACE_RGB_LINEAR;
case GIMP_LAYER_MODE_ERASE:
- return GIMP_LAYER_BLEND_RGB_LINEAR;
+ return GIMP_LAYER_COLOR_SPACE_RGB_LINEAR;
case GIMP_LAYER_MODE_REPLACE:
- return GIMP_LAYER_BLEND_RGB_PERCEPTUAL;
+ return GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL;
case GIMP_LAYER_MODE_ANTI_ERASE:
- return GIMP_LAYER_BLEND_RGB_LINEAR;
+ return GIMP_LAYER_COLOR_SPACE_RGB_LINEAR;
}
- return GIMP_LAYER_BLEND_RGB_LINEAR;
+ return GIMP_LAYER_COLOR_SPACE_RGB_LINEAR;
}
-GimpLayerBlendTRC
-gimp_layer_mode_get_composite_trc (GimpLayerMode mode)
+GimpLayerColorSpace
+gimp_layer_mode_get_composite_space (GimpLayerMode mode)
{
- return GIMP_LAYER_BLEND_RGB_LINEAR;
+ return GIMP_LAYER_COLOR_SPACE_RGB_LINEAR;
}
GimpLayerCompositeMode
diff --git a/app/core/gimp-layer-modes.h b/app/core/gimp-layer-modes.h
index 783248f..3d9e0d7 100644
--- a/app/core/gimp-layer-modes.h
+++ b/app/core/gimp-layer-modes.h
@@ -23,14 +23,14 @@
#define __GIMP_LAYER_MODES_H__
-gboolean gimp_layer_mode_is_legacy (GimpLayerMode mode);
-gboolean gimp_layer_mode_is_linear (GimpLayerMode mode);
+gboolean gimp_layer_mode_is_legacy (GimpLayerMode mode);
+gboolean gimp_layer_mode_is_linear (GimpLayerMode mode);
-GimpLayerBlendTRC gimp_layer_mode_get_blend_trc (GimpLayerMode mode);
-GimpLayerBlendTRC gimp_layer_mode_get_composite_trc (GimpLayerMode mode);
-GimpLayerCompositeMode gimp_layer_mode_get_composite_mode (GimpLayerMode mode);
+GimpLayerColorSpace gimp_layer_mode_get_blend_space (GimpLayerMode mode);
+GimpLayerColorSpace gimp_layer_mode_get_composite_space (GimpLayerMode mode);
+GimpLayerCompositeMode gimp_layer_mode_get_composite_mode (GimpLayerMode mode);
-const gchar * gimp_layer_mode_get_operation (GimpLayerMode mode);
+const gchar * gimp_layer_mode_get_operation (GimpLayerMode mode);
#endif /* __GIMP_LAYER_MODES_H__ */
diff --git a/app/operations/layer-modes-legacy/gimpoperationadditionlegacy.c
b/app/operations/layer-modes-legacy/gimpoperationadditionlegacy.c
index 3cb1a78..712810a 100644
--- a/app/operations/layer-modes-legacy/gimpoperationadditionlegacy.c
+++ b/app/operations/layer-modes-legacy/gimpoperationadditionlegacy.c
@@ -94,8 +94,8 @@ gimp_operation_addition_legacy_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode)
{
const gboolean has_mask = mask != NULL;
diff --git a/app/operations/layer-modes-legacy/gimpoperationadditionlegacy.h
b/app/operations/layer-modes-legacy/gimpoperationadditionlegacy.h
index 1bca327..fbc5f9f 100644
--- a/app/operations/layer-modes-legacy/gimpoperationadditionlegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationadditionlegacy.h
@@ -57,8 +57,8 @@ gboolean gimp_operation_addition_legacy_process_pixels (gfloat *i
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes-legacy/gimpoperationburnlegacy.c
b/app/operations/layer-modes-legacy/gimpoperationburnlegacy.c
index 4f18b98..3fd1b00 100644
--- a/app/operations/layer-modes-legacy/gimpoperationburnlegacy.c
+++ b/app/operations/layer-modes-legacy/gimpoperationburnlegacy.c
@@ -94,8 +94,8 @@ gimp_operation_burn_legacy_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode)
{
const gboolean has_mask = mask != NULL;
diff --git a/app/operations/layer-modes-legacy/gimpoperationburnlegacy.h
b/app/operations/layer-modes-legacy/gimpoperationburnlegacy.h
index f298719..9c4f73c 100644
--- a/app/operations/layer-modes-legacy/gimpoperationburnlegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationburnlegacy.h
@@ -57,8 +57,8 @@ gboolean gimp_operation_burn_legacy_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes-legacy/gimpoperationdarkenonlylegacy.c
b/app/operations/layer-modes-legacy/gimpoperationdarkenonlylegacy.c
index 9d03116..ed4d555 100644
--- a/app/operations/layer-modes-legacy/gimpoperationdarkenonlylegacy.c
+++ b/app/operations/layer-modes-legacy/gimpoperationdarkenonlylegacy.c
@@ -94,8 +94,8 @@ gimp_operation_darken_only_legacy_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode)
{
const gboolean has_mask = mask != NULL;
diff --git a/app/operations/layer-modes-legacy/gimpoperationdarkenonlylegacy.h
b/app/operations/layer-modes-legacy/gimpoperationdarkenonlylegacy.h
index 1565a9a..485dae6 100644
--- a/app/operations/layer-modes-legacy/gimpoperationdarkenonlylegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationdarkenonlylegacy.h
@@ -57,8 +57,8 @@ gboolean gimp_operation_darken_only_legacy_process_pixels (gfloat
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes-legacy/gimpoperationdifferencelegacy.c
b/app/operations/layer-modes-legacy/gimpoperationdifferencelegacy.c
index 637763e..21039ff 100644
--- a/app/operations/layer-modes-legacy/gimpoperationdifferencelegacy.c
+++ b/app/operations/layer-modes-legacy/gimpoperationdifferencelegacy.c
@@ -94,8 +94,8 @@ gimp_operation_difference_legacy_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode)
{
const gboolean has_mask = mask != NULL;
diff --git a/app/operations/layer-modes-legacy/gimpoperationdifferencelegacy.h
b/app/operations/layer-modes-legacy/gimpoperationdifferencelegacy.h
index cb747e9..066cada 100644
--- a/app/operations/layer-modes-legacy/gimpoperationdifferencelegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationdifferencelegacy.h
@@ -57,8 +57,8 @@ gboolean gimp_operation_difference_legacy_process_pixels (gfloat
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes-legacy/gimpoperationdividelegacy.c
b/app/operations/layer-modes-legacy/gimpoperationdividelegacy.c
index 066f480..e63518f 100644
--- a/app/operations/layer-modes-legacy/gimpoperationdividelegacy.c
+++ b/app/operations/layer-modes-legacy/gimpoperationdividelegacy.c
@@ -94,8 +94,8 @@ gimp_operation_divide_legacy_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode)
{
const gboolean has_mask = mask != NULL;
diff --git a/app/operations/layer-modes-legacy/gimpoperationdividelegacy.h
b/app/operations/layer-modes-legacy/gimpoperationdividelegacy.h
index 59d2f7f..4e3708f 100644
--- a/app/operations/layer-modes-legacy/gimpoperationdividelegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationdividelegacy.h
@@ -57,8 +57,8 @@ gboolean gimp_operation_divide_legacy_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes-legacy/gimpoperationdodgelegacy.c
b/app/operations/layer-modes-legacy/gimpoperationdodgelegacy.c
index 3274983..330e24f 100644
--- a/app/operations/layer-modes-legacy/gimpoperationdodgelegacy.c
+++ b/app/operations/layer-modes-legacy/gimpoperationdodgelegacy.c
@@ -94,8 +94,8 @@ gimp_operation_dodge_legacy_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode)
{
const gboolean has_mask = mask != NULL;
diff --git a/app/operations/layer-modes-legacy/gimpoperationdodgelegacy.h
b/app/operations/layer-modes-legacy/gimpoperationdodgelegacy.h
index 3eaca9e..11dee3e 100644
--- a/app/operations/layer-modes-legacy/gimpoperationdodgelegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationdodgelegacy.h
@@ -57,8 +57,8 @@ gboolean gimp_operation_dodge_legacy_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes-legacy/gimpoperationgrainextractlegacy.c
b/app/operations/layer-modes-legacy/gimpoperationgrainextractlegacy.c
index b241f35..9b92315 100644
--- a/app/operations/layer-modes-legacy/gimpoperationgrainextractlegacy.c
+++ b/app/operations/layer-modes-legacy/gimpoperationgrainextractlegacy.c
@@ -94,8 +94,8 @@ gimp_operation_grain_extract_legacy_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_Trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_Trc,
GimpLayerCompositeMode composite_mode)
{
const gboolean has_mask = mask != NULL;
diff --git a/app/operations/layer-modes-legacy/gimpoperationgrainextractlegacy.h
b/app/operations/layer-modes-legacy/gimpoperationgrainextractlegacy.h
index bdcdf67..f8c3e86 100644
--- a/app/operations/layer-modes-legacy/gimpoperationgrainextractlegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationgrainextractlegacy.h
@@ -57,8 +57,8 @@ gboolean gimp_operation_grain_extract_legacy_process_pixels (gfloat
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes-legacy/gimpoperationgrainmergelegacy.c
b/app/operations/layer-modes-legacy/gimpoperationgrainmergelegacy.c
index 2312239..3859f10 100644
--- a/app/operations/layer-modes-legacy/gimpoperationgrainmergelegacy.c
+++ b/app/operations/layer-modes-legacy/gimpoperationgrainmergelegacy.c
@@ -94,8 +94,8 @@ gimp_operation_grain_merge_legacy_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode)
{
const gboolean has_mask = mask != NULL;
diff --git a/app/operations/layer-modes-legacy/gimpoperationgrainmergelegacy.h
b/app/operations/layer-modes-legacy/gimpoperationgrainmergelegacy.h
index e38a57e..4521081 100644
--- a/app/operations/layer-modes-legacy/gimpoperationgrainmergelegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationgrainmergelegacy.h
@@ -57,8 +57,8 @@ gboolean gimp_operation_grain_merge_legacy_process_pixels (gfloat *
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes-legacy/gimpoperationhardlightlegacy.c
b/app/operations/layer-modes-legacy/gimpoperationhardlightlegacy.c
index d3e4c33..395bfd3 100644
--- a/app/operations/layer-modes-legacy/gimpoperationhardlightlegacy.c
+++ b/app/operations/layer-modes-legacy/gimpoperationhardlightlegacy.c
@@ -94,8 +94,8 @@ gimp_operation_hardlight_legacy_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode)
{
const gboolean has_mask = mask != NULL;
diff --git a/app/operations/layer-modes-legacy/gimpoperationhardlightlegacy.h
b/app/operations/layer-modes-legacy/gimpoperationhardlightlegacy.h
index 42cb00c..945feb1 100644
--- a/app/operations/layer-modes-legacy/gimpoperationhardlightlegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationhardlightlegacy.h
@@ -57,8 +57,8 @@ gboolean gimp_operation_hardlight_legacy_process_pixels (gfloat *in
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes-legacy/gimpoperationhsvcolorlegacy.c
b/app/operations/layer-modes-legacy/gimpoperationhsvcolorlegacy.c
index da4c596..6bfba7a 100644
--- a/app/operations/layer-modes-legacy/gimpoperationhsvcolorlegacy.c
+++ b/app/operations/layer-modes-legacy/gimpoperationhsvcolorlegacy.c
@@ -98,8 +98,8 @@ gimp_operation_hsv_color_legacy_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode)
{
const gboolean has_mask = mask != NULL;
diff --git a/app/operations/layer-modes-legacy/gimpoperationhsvcolorlegacy.h
b/app/operations/layer-modes-legacy/gimpoperationhsvcolorlegacy.h
index 79f7098..e38a0ca 100644
--- a/app/operations/layer-modes-legacy/gimpoperationhsvcolorlegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationhsvcolorlegacy.h
@@ -57,8 +57,8 @@ gboolean gimp_operation_hsv_color_legacy_process_pixels (gfloat *in
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes-legacy/gimpoperationhsvhuelegacy.c
b/app/operations/layer-modes-legacy/gimpoperationhsvhuelegacy.c
index 556c9ee..33fee2f 100644
--- a/app/operations/layer-modes-legacy/gimpoperationhsvhuelegacy.c
+++ b/app/operations/layer-modes-legacy/gimpoperationhsvhuelegacy.c
@@ -98,8 +98,8 @@ gimp_operation_hsv_hue_legacy_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode)
{
const gboolean has_mask = mask != NULL;
diff --git a/app/operations/layer-modes-legacy/gimpoperationhsvhuelegacy.h
b/app/operations/layer-modes-legacy/gimpoperationhsvhuelegacy.h
index f4f0967..1fd7faf 100644
--- a/app/operations/layer-modes-legacy/gimpoperationhsvhuelegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationhsvhuelegacy.h
@@ -57,8 +57,8 @@ gboolean gimp_operation_hsv_hue_legacy_process_pixels (gfloat *in
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes-legacy/gimpoperationhsvsaturationlegacy.h
b/app/operations/layer-modes-legacy/gimpoperationhsvsaturationlegacy.h
index 683866f..9539221 100644
--- a/app/operations/layer-modes-legacy/gimpoperationhsvsaturationlegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationhsvsaturationlegacy.h
@@ -57,8 +57,8 @@ gboolean gimp_operation_hsv_saturation_legacy_process_pixels (gfloat
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes-legacy/gimpoperationhsvvaluelegacy.h
b/app/operations/layer-modes-legacy/gimpoperationhsvvaluelegacy.h
index a4a03fe..00c5311 100644
--- a/app/operations/layer-modes-legacy/gimpoperationhsvvaluelegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationhsvvaluelegacy.h
@@ -57,8 +57,8 @@ gboolean gimp_operation_hsv_value_legacy_process_pixels (gfloat *
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes-legacy/gimpoperationlightenonlylegacy.h
b/app/operations/layer-modes-legacy/gimpoperationlightenonlylegacy.h
index a1d125f..8b98e33 100644
--- a/app/operations/layer-modes-legacy/gimpoperationlightenonlylegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationlightenonlylegacy.h
@@ -57,8 +57,8 @@ gboolean gimp_operation_lighten_only_legacy_process_pixels (gfloat
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes-legacy/gimpoperationmultiplylegacy.h
b/app/operations/layer-modes-legacy/gimpoperationmultiplylegacy.h
index 86ac528..2e3aff7 100644
--- a/app/operations/layer-modes-legacy/gimpoperationmultiplylegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationmultiplylegacy.h
@@ -57,8 +57,8 @@ gboolean gimp_operation_multiply_legacy_process_pixels (gfloat *i
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes-legacy/gimpoperationscreenlegacy.h
b/app/operations/layer-modes-legacy/gimpoperationscreenlegacy.h
index ea941b7..c43e18a 100644
--- a/app/operations/layer-modes-legacy/gimpoperationscreenlegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationscreenlegacy.h
@@ -57,8 +57,8 @@ gboolean gimp_operation_screen_legacy_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes-legacy/gimpoperationsoftlightlegacy.h
b/app/operations/layer-modes-legacy/gimpoperationsoftlightlegacy.h
index 5ea11b0..42b125e 100644
--- a/app/operations/layer-modes-legacy/gimpoperationsoftlightlegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationsoftlightlegacy.h
@@ -57,8 +57,8 @@ gboolean gimp_operation_softlight_legacy_process_pixels (gfloat *
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes-legacy/gimpoperationsubtractlegacy.h
b/app/operations/layer-modes-legacy/gimpoperationsubtractlegacy.h
index e59ebaa..97ce1d6 100644
--- a/app/operations/layer-modes-legacy/gimpoperationsubtractlegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationsubtractlegacy.h
@@ -57,8 +57,8 @@ gboolean gimp_operation_subtract_legacy_process_pixels (gfloat *i
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes/gimpblendcomposite.h b/app/operations/layer-modes/gimpblendcomposite.h
index ddcb232..94246a3 100644
--- a/app/operations/layer-modes/gimpblendcomposite.h
+++ b/app/operations/layer-modes/gimpblendcomposite.h
@@ -209,8 +209,8 @@ gimp_composite_blend (gfloat *in,
gfloat *out,
gfloat opacity,
glong samples,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode,
GimpBlendFunc blend_func)
{
@@ -225,60 +225,60 @@ gimp_composite_blend (gfloat *in,
switch (blend_trc)
{
default:
- case GIMP_LAYER_BLEND_RGB_LINEAR:
+ case GIMP_LAYER_COLOR_SPACE_RGB_LINEAR:
fish_to_blend = NULL;
switch (composite_trc)
{
- case GIMP_LAYER_BLEND_LAB:
+ case GIMP_LAYER_COLOR_SPACE_LAB:
fish_to_composite = _gimp_fish_rgba_to_laba;
fish_from_composite = _gimp_fish_laba_to_rgba;
break;
default:
- case GIMP_LAYER_BLEND_RGB_LINEAR:
+ case GIMP_LAYER_COLOR_SPACE_RGB_LINEAR:
fish_to_composite = NULL;
fish_from_composite = NULL;
break;
- case GIMP_LAYER_BLEND_RGB_PERCEPTUAL:
+ case GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL:
fish_to_composite = _gimp_fish_rgba_to_perceptual;
fish_from_composite = _gimp_fish_perceptual_to_rgba;
break;
}
break;
- case GIMP_LAYER_BLEND_LAB:
+ case GIMP_LAYER_COLOR_SPACE_LAB:
fish_to_blend = _gimp_fish_rgba_to_laba;
switch (composite_trc)
{
- case GIMP_LAYER_BLEND_LAB:
+ case GIMP_LAYER_COLOR_SPACE_LAB:
default:
fish_to_composite = NULL;
fish_from_composite = _gimp_fish_laba_to_rgba;
break;
- case GIMP_LAYER_BLEND_RGB_LINEAR:
+ case GIMP_LAYER_COLOR_SPACE_RGB_LINEAR:
fish_to_composite = _gimp_fish_laba_to_rgba;
fish_from_composite = NULL;
break;
- case GIMP_LAYER_BLEND_RGB_PERCEPTUAL:
+ case GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL:
fish_to_composite = _gimp_fish_laba_to_perceptual;
fish_from_composite = _gimp_fish_perceptual_to_rgba;
break;
}
break;
- case GIMP_LAYER_BLEND_RGB_PERCEPTUAL:
+ case GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL:
fish_to_blend = _gimp_fish_rgba_to_perceptual;
switch (composite_trc)
{
- case GIMP_LAYER_BLEND_LAB:
+ case GIMP_LAYER_COLOR_SPACE_LAB:
default:
fish_to_composite = _gimp_fish_perceptual_to_laba;
fish_from_composite = NULL;
break;
- case GIMP_LAYER_BLEND_RGB_LINEAR:
+ case GIMP_LAYER_COLOR_SPACE_RGB_LINEAR:
fish_to_composite = _gimp_fish_perceptual_to_rgba;
fish_from_composite = NULL;
break;
- case GIMP_LAYER_BLEND_RGB_PERCEPTUAL:
+ case GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL:
fish_to_composite = NULL;
fish_from_composite = _gimp_fish_perceptual_to_rgba;
break;
@@ -306,7 +306,7 @@ gimp_composite_blend (gfloat *in,
if (fish_to_composite)
{
- if (composite_trc == GIMP_LAYER_BLEND_RGB_LINEAR)
+ if (composite_trc == GIMP_LAYER_COLOR_SPACE_RGB_LINEAR)
{
blend_in = in;
blend_layer = layer;
diff --git a/app/operations/layer-modes/gimpoperationaddition.c
b/app/operations/layer-modes/gimpoperationaddition.c
index 5d11e20..d758cf7 100644
--- a/app/operations/layer-modes/gimpoperationaddition.c
+++ b/app/operations/layer-modes/gimpoperationaddition.c
@@ -96,8 +96,8 @@ gimp_operation_addition_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode)
{
gimp_composite_blend (in, layer, mask, out, opacity, samples,
diff --git a/app/operations/layer-modes/gimpoperationaddition.h
b/app/operations/layer-modes/gimpoperationaddition.h
index 91c5187..6538ffa 100644
--- a/app/operations/layer-modes/gimpoperationaddition.h
+++ b/app/operations/layer-modes/gimpoperationaddition.h
@@ -58,8 +58,8 @@ gboolean gimp_operation_addition_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes/gimpoperationantierase.c
b/app/operations/layer-modes/gimpoperationantierase.c
index 4340d2a..9fd6286 100644
--- a/app/operations/layer-modes/gimpoperationantierase.c
+++ b/app/operations/layer-modes/gimpoperationantierase.c
@@ -94,8 +94,8 @@ gimp_operation_anti_erase_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode)
{
const gboolean has_mask = mask != NULL;
diff --git a/app/operations/layer-modes/gimpoperationantierase.h
b/app/operations/layer-modes/gimpoperationantierase.h
index e1926df..c108324 100644
--- a/app/operations/layer-modes/gimpoperationantierase.h
+++ b/app/operations/layer-modes/gimpoperationantierase.h
@@ -57,8 +57,8 @@ gboolean gimp_operation_anti_erase_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes/gimpoperationbehind.c
b/app/operations/layer-modes/gimpoperationbehind.c
index f100a85..a4d15b8 100644
--- a/app/operations/layer-modes/gimpoperationbehind.c
+++ b/app/operations/layer-modes/gimpoperationbehind.c
@@ -94,8 +94,8 @@ gimp_operation_behind_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode)
{
const gboolean has_mask = mask != NULL;
diff --git a/app/operations/layer-modes/gimpoperationbehind.h
b/app/operations/layer-modes/gimpoperationbehind.h
index 191c8b5..fb32de8 100644
--- a/app/operations/layer-modes/gimpoperationbehind.h
+++ b/app/operations/layer-modes/gimpoperationbehind.h
@@ -57,8 +57,8 @@ gboolean gimp_operation_behind_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes/gimpoperationburn.c b/app/operations/layer-modes/gimpoperationburn.c
index 1b7e28f..db1d675 100644
--- a/app/operations/layer-modes/gimpoperationburn.c
+++ b/app/operations/layer-modes/gimpoperationburn.c
@@ -96,8 +96,8 @@ gimp_operation_burn_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode)
{
gimp_composite_blend (in, layer, mask, out, opacity, samples,
diff --git a/app/operations/layer-modes/gimpoperationburn.h b/app/operations/layer-modes/gimpoperationburn.h
index 7940e00..5404290 100644
--- a/app/operations/layer-modes/gimpoperationburn.h
+++ b/app/operations/layer-modes/gimpoperationburn.h
@@ -58,8 +58,8 @@ gboolean gimp_operation_burn_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes/gimpoperationcolorerase.c
b/app/operations/layer-modes/gimpoperationcolorerase.c
index 7f15f74..7f3f99f 100644
--- a/app/operations/layer-modes/gimpoperationcolorerase.c
+++ b/app/operations/layer-modes/gimpoperationcolorerase.c
@@ -98,8 +98,8 @@ gimp_operation_color_erase_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode)
{
const gboolean has_mask = mask != NULL;
diff --git a/app/operations/layer-modes/gimpoperationcolorerase.h
b/app/operations/layer-modes/gimpoperationcolorerase.h
index 597eed0..f1f8912 100644
--- a/app/operations/layer-modes/gimpoperationcolorerase.h
+++ b/app/operations/layer-modes/gimpoperationcolorerase.h
@@ -57,8 +57,8 @@ gboolean gimp_operation_color_erase_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes/gimpoperationdarkenonly.c
b/app/operations/layer-modes/gimpoperationdarkenonly.c
index 88fba86..bc818c6 100644
--- a/app/operations/layer-modes/gimpoperationdarkenonly.c
+++ b/app/operations/layer-modes/gimpoperationdarkenonly.c
@@ -96,8 +96,8 @@ gimp_operation_darken_only_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode)
{
gimp_composite_blend (in, layer, mask, out, opacity, samples,
diff --git a/app/operations/layer-modes/gimpoperationdarkenonly.h
b/app/operations/layer-modes/gimpoperationdarkenonly.h
index 3baee1e..a075959 100644
--- a/app/operations/layer-modes/gimpoperationdarkenonly.h
+++ b/app/operations/layer-modes/gimpoperationdarkenonly.h
@@ -58,8 +58,8 @@ gboolean gimp_operation_darken_only_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes/gimpoperationdifference.c
b/app/operations/layer-modes/gimpoperationdifference.c
index 4e2710f..c9bc28b 100644
--- a/app/operations/layer-modes/gimpoperationdifference.c
+++ b/app/operations/layer-modes/gimpoperationdifference.c
@@ -96,8 +96,8 @@ gimp_operation_difference_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode)
{
gimp_composite_blend (in, layer, mask, out, opacity, samples,
diff --git a/app/operations/layer-modes/gimpoperationdifference.h
b/app/operations/layer-modes/gimpoperationdifference.h
index 605f69c..366835b 100644
--- a/app/operations/layer-modes/gimpoperationdifference.h
+++ b/app/operations/layer-modes/gimpoperationdifference.h
@@ -58,8 +58,8 @@ gboolean gimp_operation_difference_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes/gimpoperationdissolve.c
b/app/operations/layer-modes/gimpoperationdissolve.c
index acfbf0d..867c573 100644
--- a/app/operations/layer-modes/gimpoperationdissolve.c
+++ b/app/operations/layer-modes/gimpoperationdissolve.c
@@ -110,8 +110,8 @@ gimp_operation_dissolve_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *result,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode)
{
const gboolean has_mask = mask != NULL;
diff --git a/app/operations/layer-modes/gimpoperationdissolve.h
b/app/operations/layer-modes/gimpoperationdissolve.h
index af06749..604aa74 100644
--- a/app/operations/layer-modes/gimpoperationdissolve.h
+++ b/app/operations/layer-modes/gimpoperationdissolve.h
@@ -57,8 +57,8 @@ gboolean gimp_operation_dissolve_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *result,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes/gimpoperationdivide.c
b/app/operations/layer-modes/gimpoperationdivide.c
index a7fadb4..79a4ea4 100644
--- a/app/operations/layer-modes/gimpoperationdivide.c
+++ b/app/operations/layer-modes/gimpoperationdivide.c
@@ -96,8 +96,8 @@ gimp_operation_divide_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode)
{
gimp_composite_blend (in, layer, mask, out, opacity, samples,
diff --git a/app/operations/layer-modes/gimpoperationdivide.h
b/app/operations/layer-modes/gimpoperationdivide.h
index 51290ce..021da6e 100644
--- a/app/operations/layer-modes/gimpoperationdivide.h
+++ b/app/operations/layer-modes/gimpoperationdivide.h
@@ -58,8 +58,8 @@ gboolean gimp_operation_divide_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes/gimpoperationdodge.c b/app/operations/layer-modes/gimpoperationdodge.c
index ee7dd51..c97ba22 100644
--- a/app/operations/layer-modes/gimpoperationdodge.c
+++ b/app/operations/layer-modes/gimpoperationdodge.c
@@ -96,8 +96,8 @@ gimp_operation_dodge_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode)
{
gimp_composite_blend (in, layer, mask, out, opacity, samples,
diff --git a/app/operations/layer-modes/gimpoperationdodge.h b/app/operations/layer-modes/gimpoperationdodge.h
index 5e1f18d..162dc2f 100644
--- a/app/operations/layer-modes/gimpoperationdodge.h
+++ b/app/operations/layer-modes/gimpoperationdodge.h
@@ -58,8 +58,8 @@ gboolean gimp_operation_dodge_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes/gimpoperationerase.c b/app/operations/layer-modes/gimpoperationerase.c
index 2ba62dd..8b50e47 100644
--- a/app/operations/layer-modes/gimpoperationerase.c
+++ b/app/operations/layer-modes/gimpoperationerase.c
@@ -94,8 +94,8 @@ gimp_operation_erase_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode)
{
const gboolean has_mask = mask != NULL;
diff --git a/app/operations/layer-modes/gimpoperationerase.h b/app/operations/layer-modes/gimpoperationerase.h
index d9f5caf..e320f0c 100644
--- a/app/operations/layer-modes/gimpoperationerase.h
+++ b/app/operations/layer-modes/gimpoperationerase.h
@@ -57,8 +57,8 @@ gboolean gimp_operation_erase_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes/gimpoperationgrainextract.c
b/app/operations/layer-modes/gimpoperationgrainextract.c
index 8fd99da..79aca58 100644
--- a/app/operations/layer-modes/gimpoperationgrainextract.c
+++ b/app/operations/layer-modes/gimpoperationgrainextract.c
@@ -96,8 +96,8 @@ gimp_operation_grain_extract_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode)
{
gimp_composite_blend (in, layer, mask, out, opacity, samples,
diff --git a/app/operations/layer-modes/gimpoperationgrainextract.h
b/app/operations/layer-modes/gimpoperationgrainextract.h
index 667b30b..e34bdce 100644
--- a/app/operations/layer-modes/gimpoperationgrainextract.h
+++ b/app/operations/layer-modes/gimpoperationgrainextract.h
@@ -58,8 +58,8 @@ gboolean gimp_operation_grain_extract_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes/gimpoperationgrainmerge.c
b/app/operations/layer-modes/gimpoperationgrainmerge.c
index 0858f49..492dcad 100644
--- a/app/operations/layer-modes/gimpoperationgrainmerge.c
+++ b/app/operations/layer-modes/gimpoperationgrainmerge.c
@@ -96,8 +96,8 @@ gimp_operation_grain_merge_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode)
{
gimp_composite_blend (in, layer, mask, out, opacity, samples,
diff --git a/app/operations/layer-modes/gimpoperationgrainmerge.h
b/app/operations/layer-modes/gimpoperationgrainmerge.h
index a4a9438..875db95 100644
--- a/app/operations/layer-modes/gimpoperationgrainmerge.h
+++ b/app/operations/layer-modes/gimpoperationgrainmerge.h
@@ -58,8 +58,8 @@ gboolean gimp_operation_grain_merge_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes/gimpoperationhardlight.c
b/app/operations/layer-modes/gimpoperationhardlight.c
index 926ad58..50040cd 100644
--- a/app/operations/layer-modes/gimpoperationhardlight.c
+++ b/app/operations/layer-modes/gimpoperationhardlight.c
@@ -95,8 +95,8 @@ gimp_operation_hardlight_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode)
{
gimp_composite_blend (in, layer, mask, out, opacity, samples,
diff --git a/app/operations/layer-modes/gimpoperationhardlight.h
b/app/operations/layer-modes/gimpoperationhardlight.h
index 8ded0f3..790e5cc 100644
--- a/app/operations/layer-modes/gimpoperationhardlight.h
+++ b/app/operations/layer-modes/gimpoperationhardlight.h
@@ -57,8 +57,8 @@ gboolean gimp_operation_hardlight_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes/gimpoperationhsvcolor.c
b/app/operations/layer-modes/gimpoperationhsvcolor.c
index 16d0dba..5a61fb9 100644
--- a/app/operations/layer-modes/gimpoperationhsvcolor.c
+++ b/app/operations/layer-modes/gimpoperationhsvcolor.c
@@ -100,8 +100,8 @@ gimp_operation_hsv_color_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode)
{
gimp_composite_blend (in, layer, mask, out, opacity, samples,
diff --git a/app/operations/layer-modes/gimpoperationhsvcolor.h
b/app/operations/layer-modes/gimpoperationhsvcolor.h
index 71909d4..54d2b2f 100644
--- a/app/operations/layer-modes/gimpoperationhsvcolor.h
+++ b/app/operations/layer-modes/gimpoperationhsvcolor.h
@@ -58,8 +58,8 @@ gboolean gimp_operation_hsv_color_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes/gimpoperationhsvhue.c
b/app/operations/layer-modes/gimpoperationhsvhue.c
index 05ae6a0..f040942 100644
--- a/app/operations/layer-modes/gimpoperationhsvhue.c
+++ b/app/operations/layer-modes/gimpoperationhsvhue.c
@@ -100,8 +100,8 @@ gimp_operation_hsv_hue_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode)
{
gimp_composite_blend (in, layer, mask, out, opacity, samples,
diff --git a/app/operations/layer-modes/gimpoperationhsvhue.h
b/app/operations/layer-modes/gimpoperationhsvhue.h
index 5f81f96..724d4bd 100644
--- a/app/operations/layer-modes/gimpoperationhsvhue.h
+++ b/app/operations/layer-modes/gimpoperationhsvhue.h
@@ -58,8 +58,8 @@ gboolean gimp_operation_hsv_hue_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes/gimpoperationhsvsaturation.c
b/app/operations/layer-modes/gimpoperationhsvsaturation.c
index ad463da..c3910c2 100644
--- a/app/operations/layer-modes/gimpoperationhsvsaturation.c
+++ b/app/operations/layer-modes/gimpoperationhsvsaturation.c
@@ -100,8 +100,8 @@ gimp_operation_hsv_saturation_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode)
{
gimp_composite_blend (in, layer, mask, out, opacity, samples,
diff --git a/app/operations/layer-modes/gimpoperationhsvsaturation.h
b/app/operations/layer-modes/gimpoperationhsvsaturation.h
index d9274e7..ba22f23 100644
--- a/app/operations/layer-modes/gimpoperationhsvsaturation.h
+++ b/app/operations/layer-modes/gimpoperationhsvsaturation.h
@@ -58,8 +58,8 @@ gboolean gimp_operation_hsv_saturation_process_pixels (gfloat *in
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes/gimpoperationhsvvalue.c
b/app/operations/layer-modes/gimpoperationhsvvalue.c
index 6c52cd1..a8cf4b6 100644
--- a/app/operations/layer-modes/gimpoperationhsvvalue.c
+++ b/app/operations/layer-modes/gimpoperationhsvvalue.c
@@ -100,8 +100,8 @@ gimp_operation_hsv_value_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode)
{
gimp_composite_blend (in, layer, mask, out, opacity, samples,
diff --git a/app/operations/layer-modes/gimpoperationhsvvalue.h
b/app/operations/layer-modes/gimpoperationhsvvalue.h
index 8fa9104..7419d76 100644
--- a/app/operations/layer-modes/gimpoperationhsvvalue.h
+++ b/app/operations/layer-modes/gimpoperationhsvvalue.h
@@ -58,8 +58,8 @@ gboolean gimp_operation_hsv_value_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes/gimpoperationlchchroma.c
b/app/operations/layer-modes/gimpoperationlchchroma.c
index 6e691fc..092d1bb 100644
--- a/app/operations/layer-modes/gimpoperationlchchroma.c
+++ b/app/operations/layer-modes/gimpoperationlchchroma.c
@@ -101,8 +101,8 @@ gimp_operation_lch_chroma_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode)
{
gimp_composite_blend (in, layer, mask, out, opacity, samples,
diff --git a/app/operations/layer-modes/gimpoperationlchchroma.h
b/app/operations/layer-modes/gimpoperationlchchroma.h
index c3e48eb..40cab8d 100644
--- a/app/operations/layer-modes/gimpoperationlchchroma.h
+++ b/app/operations/layer-modes/gimpoperationlchchroma.h
@@ -59,8 +59,8 @@ gboolean gimp_operation_lch_chroma_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes/gimpoperationlchcolor.c
b/app/operations/layer-modes/gimpoperationlchcolor.c
index 9c910de..f2ecadd 100644
--- a/app/operations/layer-modes/gimpoperationlchcolor.c
+++ b/app/operations/layer-modes/gimpoperationlchcolor.c
@@ -101,8 +101,8 @@ gimp_operation_lch_color_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode)
{
gimp_composite_blend (in, layer, mask, out, opacity, samples,
diff --git a/app/operations/layer-modes/gimpoperationlchcolor.h
b/app/operations/layer-modes/gimpoperationlchcolor.h
index 476f894..8ea4aff 100644
--- a/app/operations/layer-modes/gimpoperationlchcolor.h
+++ b/app/operations/layer-modes/gimpoperationlchcolor.h
@@ -59,8 +59,8 @@ gboolean gimp_operation_lch_color_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes/gimpoperationlchhue.c
b/app/operations/layer-modes/gimpoperationlchhue.c
index bad999d..8fa855d 100644
--- a/app/operations/layer-modes/gimpoperationlchhue.c
+++ b/app/operations/layer-modes/gimpoperationlchhue.c
@@ -101,8 +101,8 @@ gimp_operation_lch_hue_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode)
{
gimp_composite_blend (in, layer, mask, out, opacity, samples,
diff --git a/app/operations/layer-modes/gimpoperationlchhue.h
b/app/operations/layer-modes/gimpoperationlchhue.h
index 2fb4d24..2469342 100644
--- a/app/operations/layer-modes/gimpoperationlchhue.h
+++ b/app/operations/layer-modes/gimpoperationlchhue.h
@@ -59,8 +59,8 @@ gboolean gimp_operation_lch_hue_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode);
#endif /* __GIMP_OPERATION_LCH_HUE_H__ */
diff --git a/app/operations/layer-modes/gimpoperationlchlightness.c
b/app/operations/layer-modes/gimpoperationlchlightness.c
index 56e4065..8fa1459 100644
--- a/app/operations/layer-modes/gimpoperationlchlightness.c
+++ b/app/operations/layer-modes/gimpoperationlchlightness.c
@@ -101,8 +101,8 @@ gimp_operation_lch_lightness_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode)
{
gimp_composite_blend (in, layer, mask, out, opacity, samples,
diff --git a/app/operations/layer-modes/gimpoperationlchlightness.h
b/app/operations/layer-modes/gimpoperationlchlightness.h
index 675229a..6597a2d 100644
--- a/app/operations/layer-modes/gimpoperationlchlightness.h
+++ b/app/operations/layer-modes/gimpoperationlchlightness.h
@@ -59,8 +59,8 @@ gboolean gimp_operation_lch_lightness_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes/gimpoperationlightenonly.c
b/app/operations/layer-modes/gimpoperationlightenonly.c
index 68e3adb..081b605 100644
--- a/app/operations/layer-modes/gimpoperationlightenonly.c
+++ b/app/operations/layer-modes/gimpoperationlightenonly.c
@@ -96,8 +96,8 @@ gimp_operation_lighten_only_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode)
{
gimp_composite_blend (in, layer, mask, out, opacity, samples,
diff --git a/app/operations/layer-modes/gimpoperationlightenonly.h
b/app/operations/layer-modes/gimpoperationlightenonly.h
index dea5214..af36a1c 100644
--- a/app/operations/layer-modes/gimpoperationlightenonly.h
+++ b/app/operations/layer-modes/gimpoperationlightenonly.h
@@ -58,8 +58,8 @@ gboolean gimp_operation_lighten_only_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes/gimpoperationmultiply.c
b/app/operations/layer-modes/gimpoperationmultiply.c
index 5029665..27eb6e8 100644
--- a/app/operations/layer-modes/gimpoperationmultiply.c
+++ b/app/operations/layer-modes/gimpoperationmultiply.c
@@ -96,8 +96,8 @@ gimp_operation_multiply_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode)
{
gimp_composite_blend (in, layer, mask, out, opacity, samples,
diff --git a/app/operations/layer-modes/gimpoperationmultiply.h
b/app/operations/layer-modes/gimpoperationmultiply.h
index 9820b15..e7fe255 100644
--- a/app/operations/layer-modes/gimpoperationmultiply.h
+++ b/app/operations/layer-modes/gimpoperationmultiply.h
@@ -58,8 +58,8 @@ gboolean gimp_operation_multiply_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes/gimpoperationnormal-sse2.c
b/app/operations/layer-modes/gimpoperationnormal-sse2.c
index 065dcc4..f8d48ec 100644
--- a/app/operations/layer-modes/gimpoperationnormal-sse2.c
+++ b/app/operations/layer-modes/gimpoperationnormal-sse2.c
@@ -40,8 +40,8 @@ gimp_operation_normal_process_pixels_sse2 (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode)
{
/* check alignment */
diff --git a/app/operations/layer-modes/gimpoperationnormal-sse4.c
b/app/operations/layer-modes/gimpoperationnormal-sse4.c
index 502d3a5..ddc8d52 100644
--- a/app/operations/layer-modes/gimpoperationnormal-sse4.c
+++ b/app/operations/layer-modes/gimpoperationnormal-sse4.c
@@ -40,8 +40,8 @@ gimp_operation_normal_process_pixels_sse4 (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode)
{
/* check alignment */
diff --git a/app/operations/layer-modes/gimpoperationnormal.c
b/app/operations/layer-modes/gimpoperationnormal.c
index 412066e..20b473b 100644
--- a/app/operations/layer-modes/gimpoperationnormal.c
+++ b/app/operations/layer-modes/gimpoperationnormal.c
@@ -193,8 +193,8 @@ gimp_operation_normal_process_pixels_core (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode)
{
const gboolean has_mask = mask != NULL;
diff --git a/app/operations/layer-modes/gimpoperationnormal.h
b/app/operations/layer-modes/gimpoperationnormal.h
index 6d96122..1ab7e1b 100644
--- a/app/operations/layer-modes/gimpoperationnormal.h
+++ b/app/operations/layer-modes/gimpoperationnormal.h
@@ -59,8 +59,8 @@ gboolean gimp_operation_normal_process_pixels_core (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode);
gboolean gimp_operation_normal_process_pixels_sse2 (gfloat *in,
@@ -71,8 +71,8 @@ gboolean gimp_operation_normal_process_pixels_sse2 (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode);
gboolean gimp_operation_normal_process_pixels_sse4 (gfloat *in,
@@ -83,8 +83,8 @@ gboolean gimp_operation_normal_process_pixels_sse4 (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes/gimpoperationoverlay.c
b/app/operations/layer-modes/gimpoperationoverlay.c
index ed4e6cd..cc08d9f 100644
--- a/app/operations/layer-modes/gimpoperationoverlay.c
+++ b/app/operations/layer-modes/gimpoperationoverlay.c
@@ -95,8 +95,8 @@ gimp_operation_overlay_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode)
{
gimp_composite_blend (in, layer, mask, out, opacity, samples,
diff --git a/app/operations/layer-modes/gimpoperationoverlay.h
b/app/operations/layer-modes/gimpoperationoverlay.h
index 9fd35aa..4773828 100644
--- a/app/operations/layer-modes/gimpoperationoverlay.h
+++ b/app/operations/layer-modes/gimpoperationoverlay.h
@@ -57,8 +57,8 @@ gboolean gimp_operation_overlay_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes/gimpoperationpointlayermode.c
b/app/operations/layer-modes/gimpoperationpointlayermode.c
index 9d58cdf..fc23b04 100644
--- a/app/operations/layer-modes/gimpoperationpointlayermode.c
+++ b/app/operations/layer-modes/gimpoperationpointlayermode.c
@@ -103,8 +103,8 @@ gimp_operation_point_layer_mode_class_init (GimpOperationPointLayerModeClass *kl
g_object_class_install_property (object_class, PROP_BLEND_TRC,
g_param_spec_enum ("blend-trc",
NULL, NULL,
- GIMP_TYPE_LAYER_BLEND_TRC,
- GIMP_LAYER_BLEND_RGB_LINEAR,
+ GIMP_TYPE_LAYER_COLOR_SPACE,
+ GIMP_LAYER_COLOR_SPACE_RGB_LINEAR,
GIMP_PARAM_READWRITE |
G_PARAM_CONSTRUCT));
@@ -112,8 +112,8 @@ gimp_operation_point_layer_mode_class_init (GimpOperationPointLayerModeClass *kl
g_object_class_install_property (object_class, PROP_COMPOSITE_TRC,
g_param_spec_enum ("composite-trc",
NULL, NULL,
- GIMP_TYPE_LAYER_BLEND_TRC,
- GIMP_LAYER_BLEND_RGB_LINEAR,
+ GIMP_TYPE_LAYER_COLOR_SPACE,
+ GIMP_LAYER_COLOR_SPACE_RGB_LINEAR,
GIMP_PARAM_READWRITE |
G_PARAM_CONSTRUCT));
diff --git a/app/operations/layer-modes/gimpoperationpointlayermode.h
b/app/operations/layer-modes/gimpoperationpointlayermode.h
index d3e5eaa..f1cd7c4 100644
--- a/app/operations/layer-modes/gimpoperationpointlayermode.h
+++ b/app/operations/layer-modes/gimpoperationpointlayermode.h
@@ -46,8 +46,8 @@ struct _GimpOperationPointLayerMode
gboolean linear;
gdouble opacity;
- GimpLayerBlendTRC blend_trc;
- GimpLayerBlendTRC composite_trc;
+ GimpLayerColorSpace blend_trc;
+ GimpLayerColorSpace composite_trc;
GimpLayerCompositeMode composite_mode;
};
diff --git a/app/operations/layer-modes/gimpoperationreplace.c
b/app/operations/layer-modes/gimpoperationreplace.c
index 60ce29d..ed7b688 100644
--- a/app/operations/layer-modes/gimpoperationreplace.c
+++ b/app/operations/layer-modes/gimpoperationreplace.c
@@ -93,8 +93,8 @@ gimp_operation_replace_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode)
{
const gboolean has_mask = mask != NULL;
diff --git a/app/operations/layer-modes/gimpoperationreplace.h
b/app/operations/layer-modes/gimpoperationreplace.h
index 3804097..07f297c 100644
--- a/app/operations/layer-modes/gimpoperationreplace.h
+++ b/app/operations/layer-modes/gimpoperationreplace.h
@@ -57,8 +57,8 @@ gboolean gimp_operation_replace_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes/gimpoperationscreen.c
b/app/operations/layer-modes/gimpoperationscreen.c
index 6298eef..576db27 100644
--- a/app/operations/layer-modes/gimpoperationscreen.c
+++ b/app/operations/layer-modes/gimpoperationscreen.c
@@ -96,8 +96,8 @@ gimp_operation_screen_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode)
{
gimp_composite_blend (in, layer, mask, out, opacity, samples,
diff --git a/app/operations/layer-modes/gimpoperationscreen.h
b/app/operations/layer-modes/gimpoperationscreen.h
index ab983b5..af36c29 100644
--- a/app/operations/layer-modes/gimpoperationscreen.h
+++ b/app/operations/layer-modes/gimpoperationscreen.h
@@ -57,8 +57,8 @@ gboolean gimp_operation_screen_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes/gimpoperationsoftlight.c
b/app/operations/layer-modes/gimpoperationsoftlight.c
index c4d10d4..0df422f 100644
--- a/app/operations/layer-modes/gimpoperationsoftlight.c
+++ b/app/operations/layer-modes/gimpoperationsoftlight.c
@@ -113,8 +113,8 @@ gimp_operation_softlight_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode)
{
gimp_composite_blend (in, layer, mask, out, opacity, samples,
diff --git a/app/operations/layer-modes/gimpoperationsoftlight.h
b/app/operations/layer-modes/gimpoperationsoftlight.h
index a4154fa..a8c2c25 100644
--- a/app/operations/layer-modes/gimpoperationsoftlight.h
+++ b/app/operations/layer-modes/gimpoperationsoftlight.h
@@ -57,8 +57,8 @@ gboolean gimp_operation_softlight_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes/gimpoperationsubtract.c
b/app/operations/layer-modes/gimpoperationsubtract.c
index a01d578..1d2c058 100644
--- a/app/operations/layer-modes/gimpoperationsubtract.c
+++ b/app/operations/layer-modes/gimpoperationsubtract.c
@@ -96,8 +96,8 @@ gimp_operation_subtract_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode)
{
gimp_composite_blend (in, layer, mask, out, opacity, samples,
diff --git a/app/operations/layer-modes/gimpoperationsubtract.h
b/app/operations/layer-modes/gimpoperationsubtract.h
index d530c70..65581a8 100644
--- a/app/operations/layer-modes/gimpoperationsubtract.h
+++ b/app/operations/layer-modes/gimpoperationsubtract.h
@@ -58,8 +58,8 @@ gboolean gimp_operation_subtract_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/operations-enums.h b/app/operations/operations-enums.h
index 6b3ad20..78227ca 100644
--- a/app/operations/operations-enums.h
+++ b/app/operations/operations-enums.h
@@ -21,16 +21,16 @@
#define __OPERATIONS_ENUMS_H__
-#define GIMP_TYPE_LAYER_BLEND_TRC (gimp_layer_blend_trc_get_type ())
+#define GIMP_TYPE_LAYER_COLOR_SPACE (gimp_layer_color_space_get_type ())
-GType gimp_layer_blend_trc_get_type (void) G_GNUC_CONST;
+GType gimp_layer_color_space_get_type (void) G_GNUC_CONST;
typedef enum
{
- GIMP_LAYER_BLEND_RGB_LINEAR,
- GIMP_LAYER_BLEND_RGB_PERCEPTUAL,
- GIMP_LAYER_BLEND_LAB,
-} GimpLayerBlendTRC;
+ GIMP_LAYER_COLOR_SPACE_RGB_LINEAR,
+ GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL,
+ GIMP_LAYER_COLOR_SPACE_LAB,
+} GimpLayerColorSpace;
#define GIMP_TYPE_LAYER_COMPOSITE_MODE (gimp_layer_composite_mode_get_type ())
diff --git a/app/operations/operations-types.h b/app/operations/operations-types.h
index 820fae2..3c82a2f 100644
--- a/app/operations/operations-types.h
+++ b/app/operations/operations-types.h
@@ -63,8 +63,8 @@ typedef gboolean (* GimpLayerModeFunc) (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+ GimpLayerColorSpace blend_trc,
+ GimpLayerColorSpace composite_trc,
GimpLayerCompositeMode composite_mode);
typedef void (* GimpBlendFunc) (const float *dest,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
