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.
This commit is contained in:
Øyvind Kolås
2017-01-19 20:12:45 +01:00
parent f6436eee96
commit 386e18e510
98 changed files with 238 additions and 238 deletions

View File

@ -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;

View File

@ -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,

View File

@ -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);

View File

@ -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;

View File

@ -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);

View File

@ -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;

View File

@ -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);

View File

@ -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,

View File

@ -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);

View File

@ -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;

View File

@ -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);

View File

@ -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,

View File

@ -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);

View File

@ -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,

View File

@ -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);

View File

@ -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;

View File

@ -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);

View File

@ -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,

View File

@ -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);

View File

@ -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,

View File

@ -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);

View File

@ -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;

View File

@ -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);

View File

@ -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,

View File

@ -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);

View File

@ -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,

View File

@ -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);

View File

@ -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,

View File

@ -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);

View File

@ -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,

View File

@ -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);

View File

@ -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,

View File

@ -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);

View File

@ -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,

View File

@ -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);

View File

@ -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,

View File

@ -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);

View File

@ -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,

View File

@ -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);

View File

@ -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,

View File

@ -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);

View File

@ -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,

View File

@ -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__ */

View File

@ -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,

View File

@ -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);

View File

@ -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,

View File

@ -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);

View File

@ -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,

View File

@ -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);

View File

@ -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 */

View File

@ -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 */

View File

@ -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;

View File

@ -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);

View File

@ -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,

View File

@ -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);

View File

@ -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));

View File

@ -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;
};

View File

@ -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;

View File

@ -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);

View File

@ -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,

View File

@ -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);

View File

@ -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,

View File

@ -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);

View File

@ -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,

View File

@ -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);