[gimp] app: coding style cleanup in all layer modes, fiddle with includes a bit
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app: coding style cleanup in all layer modes, fiddle with includes a bit
- Date: Thu, 19 Jan 2017 16:49:24 +0000 (UTC)
commit d656fbab868ff7afb5ff97e5db8701a1c5709496
Author: Michael Natterer <mitch gimp org>
Date: Thu Jan 19 17:48:45 2017 +0100
app: coding style cleanup in all layer modes, fiddle with includes a bit
.../gimpoperationadditionlegacy.c | 11 ++++--
.../gimpoperationadditionlegacy.h | 2 +-
.../layer-modes-legacy/gimpoperationburnlegacy.c | 8 ++++-
.../layer-modes-legacy/gimpoperationburnlegacy.h | 2 +-
.../gimpoperationdarkenonlylegacy.c | 8 ++++-
.../gimpoperationdarkenonlylegacy.h | 2 +-
.../gimpoperationdifferencelegacy.c | 8 ++++-
.../gimpoperationdifferencelegacy.h | 2 +-
.../layer-modes-legacy/gimpoperationdividelegacy.c | 8 ++++-
.../layer-modes-legacy/gimpoperationdividelegacy.h | 2 +-
.../layer-modes-legacy/gimpoperationdodgelegacy.c | 8 ++++-
.../layer-modes-legacy/gimpoperationdodgelegacy.h | 2 +-
.../gimpoperationgrainextractlegacy.c | 8 ++++-
.../gimpoperationgrainextractlegacy.h | 2 +-
.../gimpoperationgrainmergelegacy.c | 8 ++++-
.../gimpoperationgrainmergelegacy.h | 2 +-
.../gimpoperationhardlightlegacy.c | 10 +++++-
.../gimpoperationhardlightlegacy.h | 2 +-
.../gimpoperationhsvcolorlegacy.c | 8 ++++-
.../gimpoperationhsvcolorlegacy.h | 2 +-
.../layer-modes-legacy/gimpoperationhsvhuelegacy.c | 8 ++++-
.../layer-modes-legacy/gimpoperationhsvhuelegacy.h | 2 +-
.../gimpoperationhsvsaturationlegacy.c | 8 ++++-
.../gimpoperationhsvsaturationlegacy.h | 2 +-
.../gimpoperationhsvvaluelegacy.c | 8 ++++-
.../gimpoperationhsvvaluelegacy.h | 2 +-
.../gimpoperationlightenonlylegacy.c | 8 ++++-
.../gimpoperationlightenonlylegacy.h | 2 +-
.../gimpoperationmultiplylegacy.c | 8 ++++-
.../gimpoperationmultiplylegacy.h | 2 +-
.../layer-modes-legacy/gimpoperationscreenlegacy.c | 30 ++++++++++++--------
.../layer-modes-legacy/gimpoperationscreenlegacy.h | 2 +-
.../gimpoperationsubtractlegacy.c | 8 ++++-
.../gimpoperationsubtractlegacy.h | 2 +-
app/operations/layer-modes/gimpblendcomposite.h | 7 ++++
app/operations/layer-modes/gimpoperationaddition.c | 10 ++++--
app/operations/layer-modes/gimpoperationaddition.h | 2 +-
.../layer-modes/gimpoperationantierase.c | 8 ++++-
.../layer-modes/gimpoperationantierase.h | 2 +-
app/operations/layer-modes/gimpoperationbehind.c | 11 ++++--
app/operations/layer-modes/gimpoperationbehind.h | 2 +-
app/operations/layer-modes/gimpoperationburn.c | 11 ++++--
app/operations/layer-modes/gimpoperationburn.h | 2 +-
.../layer-modes/gimpoperationcolorerase.c | 8 ++++-
.../layer-modes/gimpoperationcolorerase.h | 2 +-
.../layer-modes/gimpoperationdarkenonly.c | 11 ++++++-
.../layer-modes/gimpoperationdarkenonly.h | 2 +-
.../layer-modes/gimpoperationdifference.c | 13 ++++++--
.../layer-modes/gimpoperationdifference.h | 20 ++++++------
app/operations/layer-modes/gimpoperationdissolve.c | 8 ++++-
app/operations/layer-modes/gimpoperationdissolve.h | 2 +-
app/operations/layer-modes/gimpoperationdivide.c | 13 ++++++--
app/operations/layer-modes/gimpoperationdivide.h | 2 +-
app/operations/layer-modes/gimpoperationdodge.c | 11 ++++++-
app/operations/layer-modes/gimpoperationdodge.h | 2 +-
app/operations/layer-modes/gimpoperationerase.c | 8 ++++-
app/operations/layer-modes/gimpoperationerase.h | 2 +-
.../layer-modes/gimpoperationgrainextract.c | 13 ++++++--
.../layer-modes/gimpoperationgrainextract.h | 2 +-
.../layer-modes/gimpoperationgrainmerge.c | 13 ++++++--
.../layer-modes/gimpoperationgrainmerge.h | 2 +-
.../layer-modes/gimpoperationhardlight.c | 11 ++++++-
.../layer-modes/gimpoperationhardlight.h | 2 +-
app/operations/layer-modes/gimpoperationhsvcolor.c | 11 ++++++-
app/operations/layer-modes/gimpoperationhsvcolor.h | 2 +-
app/operations/layer-modes/gimpoperationhsvhue.c | 13 ++++++--
app/operations/layer-modes/gimpoperationhsvhue.h | 2 +-
.../layer-modes/gimpoperationhsvsaturation.c | 11 ++++++-
.../layer-modes/gimpoperationhsvsaturation.h | 2 +-
app/operations/layer-modes/gimpoperationhsvvalue.c | 13 ++++++--
app/operations/layer-modes/gimpoperationhsvvalue.h | 2 +-
.../layer-modes/gimpoperationlchchroma.c | 20 ++++++++++---
.../layer-modes/gimpoperationlchchroma.h | 4 +-
app/operations/layer-modes/gimpoperationlchcolor.c | 16 ++++++++--
app/operations/layer-modes/gimpoperationlchcolor.h | 4 +-
app/operations/layer-modes/gimpoperationlchhue.c | 19 +++++++++---
app/operations/layer-modes/gimpoperationlchhue.h | 4 +-
.../layer-modes/gimpoperationlchlightness.c | 17 ++++++++--
.../layer-modes/gimpoperationlchlightness.h | 4 +-
.../layer-modes/gimpoperationlightenonly.c | 11 ++++++-
.../layer-modes/gimpoperationlightenonly.h | 2 +-
app/operations/layer-modes/gimpoperationmultiply.c | 11 ++++++-
app/operations/layer-modes/gimpoperationmultiply.h | 2 +-
app/operations/layer-modes/gimpoperationnormal.c | 9 +++++-
app/operations/layer-modes/gimpoperationnormal.h | 6 ++--
app/operations/layer-modes/gimpoperationoverlay.c | 14 ++++++--
app/operations/layer-modes/gimpoperationoverlay.h | 2 +-
.../layer-modes/gimpoperationpointlayermode.c | 1 +
.../layer-modes/gimpoperationpointlayermode.h | 11 +------
app/operations/layer-modes/gimpoperationreplace.c | 8 ++++-
app/operations/layer-modes/gimpoperationreplace.h | 2 +-
app/operations/layer-modes/gimpoperationscreen.c | 13 ++++++--
app/operations/layer-modes/gimpoperationscreen.h | 2 +-
.../layer-modes/gimpoperationsoftlight.c | 11 ++++++-
.../layer-modes/gimpoperationsoftlight.h | 2 +-
app/operations/layer-modes/gimpoperationsubtract.c | 14 +++++++--
app/operations/layer-modes/gimpoperationsubtract.h | 2 +-
97 files changed, 483 insertions(+), 183 deletions(-)
---
diff --git a/app/operations/layer-modes-legacy/gimpoperationadditionlegacy.c
b/app/operations/layer-modes-legacy/gimpoperationadditionlegacy.c
index a72c45d..9399643 100644
--- a/app/operations/layer-modes-legacy/gimpoperationadditionlegacy.c
+++ b/app/operations/layer-modes-legacy/gimpoperationadditionlegacy.c
@@ -76,10 +76,13 @@ gimp_operation_addition_legacy_process (GeglOperation *operation,
{
GimpOperationPointLayerMode *layer_mode = (GimpOperationPointLayerMode*)operation;
- return gimp_operation_addition_legacy_process_pixels (in_buf, aux_buf,
- aux2_buf, out_buf, layer_mode->opacity, samples, roi, level,
- layer_mode->blend_trc, layer_mode->composite_trc,
- layer_mode->composite_mode);
+ return gimp_operation_addition_legacy_process_pixels (in_buf, aux_buf, aux2_buf,
+ out_buf,
+ layer_mode->opacity,
+ samples, roi, level,
+ layer_mode->blend_trc,
+ layer_mode->composite_trc,
+ layer_mode->composite_mode);
}
gboolean
diff --git a/app/operations/layer-modes-legacy/gimpoperationadditionlegacy.h
b/app/operations/layer-modes-legacy/gimpoperationadditionlegacy.h
index 644644a..1bca327 100644
--- a/app/operations/layer-modes-legacy/gimpoperationadditionlegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationadditionlegacy.h
@@ -57,7 +57,7 @@ gboolean gimp_operation_addition_legacy_process_pixels (gfloat *i
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
+ GimpLayerBlendTRC blend_trc,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes-legacy/gimpoperationburnlegacy.c
b/app/operations/layer-modes-legacy/gimpoperationburnlegacy.c
index 1ed5d50..d17fa79 100644
--- a/app/operations/layer-modes-legacy/gimpoperationburnlegacy.c
+++ b/app/operations/layer-modes-legacy/gimpoperationburnlegacy.c
@@ -76,7 +76,13 @@ gimp_operation_burn_legacy_process (GeglOperation *operation,
{
GimpOperationPointLayerMode *layer_mode = (GimpOperationPointLayerMode*)operation;
- return gimp_operation_burn_legacy_process_pixels (in_buf, aux_buf, aux2_buf, out_buf, layer_mode->opacity,
samples, roi, level, layer_mode->blend_trc, layer_mode->composite_trc, layer_mode->composite_mode);
+ return gimp_operation_burn_legacy_process_pixels (in_buf, aux_buf, aux2_buf,
+ out_buf,
+ layer_mode->opacity,
+ samples, roi, level,
+ layer_mode->blend_trc,
+ layer_mode->composite_trc,
+ layer_mode->composite_mode);
}
gboolean
diff --git a/app/operations/layer-modes-legacy/gimpoperationburnlegacy.h
b/app/operations/layer-modes-legacy/gimpoperationburnlegacy.h
index dc5dd4f..f298719 100644
--- a/app/operations/layer-modes-legacy/gimpoperationburnlegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationburnlegacy.h
@@ -57,7 +57,7 @@ gboolean gimp_operation_burn_legacy_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
+ GimpLayerBlendTRC blend_trc,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes-legacy/gimpoperationdarkenonlylegacy.c
b/app/operations/layer-modes-legacy/gimpoperationdarkenonlylegacy.c
index 764b039..b28c7e5 100644
--- a/app/operations/layer-modes-legacy/gimpoperationdarkenonlylegacy.c
+++ b/app/operations/layer-modes-legacy/gimpoperationdarkenonlylegacy.c
@@ -76,7 +76,13 @@ gimp_operation_darken_only_legacy_process (GeglOperation *operation,
{
GimpOperationPointLayerMode *layer_mode = (GimpOperationPointLayerMode*)operation;
- return gimp_operation_darken_only_legacy_process_pixels (in_buf, aux_buf, aux2_buf, out_buf,
layer_mode->opacity, samples, roi, level, layer_mode->blend_trc, layer_mode->composite_trc,
layer_mode->composite_mode);
+ return gimp_operation_darken_only_legacy_process_pixels (in_buf, aux_buf, aux2_buf,
+ out_buf,
+ layer_mode->opacity,
+ samples, roi, level,
+ layer_mode->blend_trc,
+ layer_mode->composite_trc,
+ layer_mode->composite_mode);
}
gboolean
diff --git a/app/operations/layer-modes-legacy/gimpoperationdarkenonlylegacy.h
b/app/operations/layer-modes-legacy/gimpoperationdarkenonlylegacy.h
index 3ce85b2..1565a9a 100644
--- a/app/operations/layer-modes-legacy/gimpoperationdarkenonlylegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationdarkenonlylegacy.h
@@ -57,7 +57,7 @@ gboolean gimp_operation_darken_only_legacy_process_pixels (gfloat
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
+ GimpLayerBlendTRC blend_trc,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes-legacy/gimpoperationdifferencelegacy.c
b/app/operations/layer-modes-legacy/gimpoperationdifferencelegacy.c
index 36143fa..4c52fc1 100644
--- a/app/operations/layer-modes-legacy/gimpoperationdifferencelegacy.c
+++ b/app/operations/layer-modes-legacy/gimpoperationdifferencelegacy.c
@@ -76,7 +76,13 @@ gimp_operation_difference_legacy_process (GeglOperation *operation,
{
GimpOperationPointLayerMode *layer_mode = (GimpOperationPointLayerMode*)operation;
- return gimp_operation_difference_legacy_process_pixels (in_buf, aux_buf, aux2_buf, out_buf,
layer_mode->opacity, samples, roi, level, layer_mode->blend_trc, layer_mode->composite_trc,
layer_mode->composite_mode);
+ return gimp_operation_difference_legacy_process_pixels (in_buf, aux_buf, aux2_buf,
+ out_buf,
+ layer_mode->opacity,
+ samples, roi, level,
+ layer_mode->blend_trc,
+ layer_mode->composite_trc,
+ layer_mode->composite_mode);
}
gboolean
diff --git a/app/operations/layer-modes-legacy/gimpoperationdifferencelegacy.h
b/app/operations/layer-modes-legacy/gimpoperationdifferencelegacy.h
index bb2e118..cb747e9 100644
--- a/app/operations/layer-modes-legacy/gimpoperationdifferencelegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationdifferencelegacy.h
@@ -57,7 +57,7 @@ gboolean gimp_operation_difference_legacy_process_pixels (gfloat
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
+ GimpLayerBlendTRC blend_trc,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes-legacy/gimpoperationdividelegacy.c
b/app/operations/layer-modes-legacy/gimpoperationdividelegacy.c
index e82a901..57f52cd 100644
--- a/app/operations/layer-modes-legacy/gimpoperationdividelegacy.c
+++ b/app/operations/layer-modes-legacy/gimpoperationdividelegacy.c
@@ -76,7 +76,13 @@ gimp_operation_divide_legacy_process (GeglOperation *operation,
{
GimpOperationPointLayerMode *layer_mode = (GimpOperationPointLayerMode*)operation;
- return gimp_operation_divide_legacy_process_pixels (in_buf, aux_buf, aux2_buf, out_buf,
layer_mode->opacity, samples, roi, level, layer_mode->blend_trc, layer_mode->composite_trc,
layer_mode->composite_mode);
+ return gimp_operation_divide_legacy_process_pixels (in_buf, aux_buf, aux2_buf,
+ out_buf,
+ layer_mode->opacity,
+ samples, roi, level,
+ layer_mode->blend_trc,
+ layer_mode->composite_trc,
+ layer_mode->composite_mode);
}
gboolean
diff --git a/app/operations/layer-modes-legacy/gimpoperationdividelegacy.h
b/app/operations/layer-modes-legacy/gimpoperationdividelegacy.h
index f2f4dd6..59d2f7f 100644
--- a/app/operations/layer-modes-legacy/gimpoperationdividelegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationdividelegacy.h
@@ -57,7 +57,7 @@ gboolean gimp_operation_divide_legacy_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
+ GimpLayerBlendTRC blend_trc,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes-legacy/gimpoperationdodgelegacy.c
b/app/operations/layer-modes-legacy/gimpoperationdodgelegacy.c
index 024ecb6..a4e3860 100644
--- a/app/operations/layer-modes-legacy/gimpoperationdodgelegacy.c
+++ b/app/operations/layer-modes-legacy/gimpoperationdodgelegacy.c
@@ -76,7 +76,13 @@ gimp_operation_dodge_legacy_process (GeglOperation *operation,
{
GimpOperationPointLayerMode *layer_mode = (GimpOperationPointLayerMode*)operation;
- return gimp_operation_dodge_legacy_process_pixels (in_buf, aux_buf, aux2_buf, out_buf,
layer_mode->opacity, samples, roi, level, layer_mode->blend_trc, layer_mode->composite_trc,
layer_mode->composite_mode);
+ return gimp_operation_dodge_legacy_process_pixels (in_buf, aux_buf, aux2_buf,
+ out_buf,
+ layer_mode->opacity,
+ samples, roi, level,
+ layer_mode->blend_trc,
+ layer_mode->composite_trc,
+ layer_mode->composite_mode);
}
gboolean
diff --git a/app/operations/layer-modes-legacy/gimpoperationdodgelegacy.h
b/app/operations/layer-modes-legacy/gimpoperationdodgelegacy.h
index e29edd7..3eaca9e 100644
--- a/app/operations/layer-modes-legacy/gimpoperationdodgelegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationdodgelegacy.h
@@ -57,7 +57,7 @@ gboolean gimp_operation_dodge_legacy_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
+ GimpLayerBlendTRC blend_trc,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes-legacy/gimpoperationgrainextractlegacy.c
b/app/operations/layer-modes-legacy/gimpoperationgrainextractlegacy.c
index 7c02900..9248bc6 100644
--- a/app/operations/layer-modes-legacy/gimpoperationgrainextractlegacy.c
+++ b/app/operations/layer-modes-legacy/gimpoperationgrainextractlegacy.c
@@ -76,7 +76,13 @@ gimp_operation_grain_extract_legacy_process (GeglOperation *operation,
{
GimpOperationPointLayerMode *layer_mode = (GimpOperationPointLayerMode*)operation;
- return gimp_operation_grain_extract_legacy_process_pixels (in_buf, aux_buf, aux2_buf, out_buf,
layer_mode->opacity, samples, roi, level, layer_mode->blend_trc, layer_mode->composite_trc,
layer_mode->composite_mode);
+ return gimp_operation_grain_extract_legacy_process_pixels (in_buf, aux_buf, aux2_buf,
+ out_buf,
+ layer_mode->opacity,
+ samples, roi, level,
+ layer_mode->blend_trc,
+ layer_mode->composite_trc,
+ layer_mode->composite_mode);
}
gboolean
diff --git a/app/operations/layer-modes-legacy/gimpoperationgrainextractlegacy.h
b/app/operations/layer-modes-legacy/gimpoperationgrainextractlegacy.h
index e1d91d2..bdcdf67 100644
--- a/app/operations/layer-modes-legacy/gimpoperationgrainextractlegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationgrainextractlegacy.h
@@ -57,7 +57,7 @@ gboolean gimp_operation_grain_extract_legacy_process_pixels (gfloat
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
+ GimpLayerBlendTRC blend_trc,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes-legacy/gimpoperationgrainmergelegacy.c
b/app/operations/layer-modes-legacy/gimpoperationgrainmergelegacy.c
index 2534f5d..03cebe3 100644
--- a/app/operations/layer-modes-legacy/gimpoperationgrainmergelegacy.c
+++ b/app/operations/layer-modes-legacy/gimpoperationgrainmergelegacy.c
@@ -76,7 +76,13 @@ gimp_operation_grain_merge_legacy_process (GeglOperation *operation,
{
GimpOperationPointLayerMode *layer_mode = (GimpOperationPointLayerMode*)operation;
- return gimp_operation_grain_merge_legacy_process_pixels (in_buf, aux_buf, aux2_buf, out_buf,
layer_mode->opacity, samples, roi, level, layer_mode->blend_trc, layer_mode->composite_trc,
layer_mode->composite_mode);
+ return gimp_operation_grain_merge_legacy_process_pixels (in_buf, aux_buf, aux2_buf,
+ out_buf,
+ layer_mode->opacity,
+ samples, roi, level,
+ layer_mode->blend_trc,
+ layer_mode->composite_trc,
+ layer_mode->composite_mode);
}
gboolean
diff --git a/app/operations/layer-modes-legacy/gimpoperationgrainmergelegacy.h
b/app/operations/layer-modes-legacy/gimpoperationgrainmergelegacy.h
index 4f4db94..e38a57e 100644
--- a/app/operations/layer-modes-legacy/gimpoperationgrainmergelegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationgrainmergelegacy.h
@@ -57,7 +57,7 @@ gboolean gimp_operation_grain_merge_legacy_process_pixels (gfloat *
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
+ GimpLayerBlendTRC blend_trc,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes-legacy/gimpoperationhardlightlegacy.c
b/app/operations/layer-modes-legacy/gimpoperationhardlightlegacy.c
index 6b7dc4c..45d18b8 100644
--- a/app/operations/layer-modes-legacy/gimpoperationhardlightlegacy.c
+++ b/app/operations/layer-modes-legacy/gimpoperationhardlightlegacy.c
@@ -36,7 +36,7 @@ static gboolean gimp_operation_hardlight_legacy_process (GeglOperation *op
glong samples,
const GeglRectangle *roi,
gint level);
-
+
G_DEFINE_TYPE (GimpOperationHardlightLegacy, gimp_operation_hardlight_legacy,
GIMP_TYPE_OPERATION_POINT_LAYER_MODE)
@@ -76,7 +76,13 @@ gimp_operation_hardlight_legacy_process (GeglOperation *operation,
{
GimpOperationPointLayerMode *layer_mode = (GimpOperationPointLayerMode*)operation;
- return gimp_operation_hardlight_legacy_process_pixels (in_buf, aux_buf, aux2_buf, out_buf,
layer_mode->opacity, samples, roi, level, layer_mode->blend_trc, layer_mode->composite_trc,
layer_mode->composite_mode);
+ return gimp_operation_hardlight_legacy_process_pixels (in_buf, aux_buf, aux2_buf,
+ out_buf,
+ layer_mode->opacity,
+ samples, roi, level,
+ layer_mode->blend_trc,
+ layer_mode->composite_trc,
+ layer_mode->composite_mode);
}
gboolean
diff --git a/app/operations/layer-modes-legacy/gimpoperationhardlightlegacy.h
b/app/operations/layer-modes-legacy/gimpoperationhardlightlegacy.h
index a704750..42cb00c 100644
--- a/app/operations/layer-modes-legacy/gimpoperationhardlightlegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationhardlightlegacy.h
@@ -57,7 +57,7 @@ gboolean gimp_operation_hardlight_legacy_process_pixels (gfloat *in
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
+ GimpLayerBlendTRC blend_trc,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes-legacy/gimpoperationhsvcolorlegacy.c
b/app/operations/layer-modes-legacy/gimpoperationhsvcolorlegacy.c
index b653132..4bdcb25 100644
--- a/app/operations/layer-modes-legacy/gimpoperationhsvcolorlegacy.c
+++ b/app/operations/layer-modes-legacy/gimpoperationhsvcolorlegacy.c
@@ -80,7 +80,13 @@ gimp_operation_hsv_color_legacy_process (GeglOperation *operation,
{
GimpOperationPointLayerMode *layer_mode = (GimpOperationPointLayerMode*)operation;
- return gimp_operation_hsv_color_legacy_process_pixels (in_buf, aux_buf, aux2_buf, out_buf,
layer_mode->opacity, samples, roi, level, layer_mode->blend_trc, layer_mode->composite_trc,
layer_mode->composite_mode);
+ return gimp_operation_hsv_color_legacy_process_pixels (in_buf, aux_buf, aux2_buf,
+ out_buf,
+ layer_mode->opacity,
+ samples, roi, level,
+ layer_mode->blend_trc,
+ layer_mode->composite_trc,
+ layer_mode->composite_mode);
}
gboolean
diff --git a/app/operations/layer-modes-legacy/gimpoperationhsvcolorlegacy.h
b/app/operations/layer-modes-legacy/gimpoperationhsvcolorlegacy.h
index 268654c..79f7098 100644
--- a/app/operations/layer-modes-legacy/gimpoperationhsvcolorlegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationhsvcolorlegacy.h
@@ -57,7 +57,7 @@ gboolean gimp_operation_hsv_color_legacy_process_pixels (gfloat *in
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
+ GimpLayerBlendTRC blend_trc,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes-legacy/gimpoperationhsvhuelegacy.c
b/app/operations/layer-modes-legacy/gimpoperationhsvhuelegacy.c
index 5cd4cbd..41dd70d 100644
--- a/app/operations/layer-modes-legacy/gimpoperationhsvhuelegacy.c
+++ b/app/operations/layer-modes-legacy/gimpoperationhsvhuelegacy.c
@@ -80,7 +80,13 @@ gimp_operation_hsv_hue_legacy_process (GeglOperation *operation,
{
GimpOperationPointLayerMode *layer_mode = (GimpOperationPointLayerMode*)operation;
- return gimp_operation_hsv_hue_legacy_process_pixels (in_buf, aux_buf, aux2_buf, out_buf,
layer_mode->opacity, samples, roi, level, layer_mode->blend_trc, layer_mode->composite_trc,
layer_mode->composite_mode);
+ return gimp_operation_hsv_hue_legacy_process_pixels (in_buf, aux_buf, aux2_buf,
+ out_buf,
+ layer_mode->opacity,
+ samples, roi, level,
+ layer_mode->blend_trc,
+ layer_mode->composite_trc,
+ layer_mode->composite_mode);
}
gboolean
diff --git a/app/operations/layer-modes-legacy/gimpoperationhsvhuelegacy.h
b/app/operations/layer-modes-legacy/gimpoperationhsvhuelegacy.h
index 44dbd7e..943145a 100644
--- a/app/operations/layer-modes-legacy/gimpoperationhsvhuelegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationhsvhuelegacy.h
@@ -57,7 +57,7 @@ gboolean gimp_operation_hsv_hue_legacy_process_pixels (gfloat *in
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
+ GimpLayerBlendTRC blend_trc,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes-legacy/gimpoperationhsvsaturationlegacy.c
b/app/operations/layer-modes-legacy/gimpoperationhsvsaturationlegacy.c
index 42ebe11..f226990 100644
--- a/app/operations/layer-modes-legacy/gimpoperationhsvsaturationlegacy.c
+++ b/app/operations/layer-modes-legacy/gimpoperationhsvsaturationlegacy.c
@@ -80,7 +80,13 @@ gimp_operation_hsv_saturation_legacy_process (GeglOperation *operation,
{
GimpOperationPointLayerMode *layer_mode = (GimpOperationPointLayerMode*)operation;
- return gimp_operation_hsv_saturation_legacy_process_pixels (in_buf, aux_buf, aux2_buf, out_buf,
layer_mode->opacity, samples, roi, level, layer_mode->blend_trc, layer_mode->composite_trc,
layer_mode->composite_mode);
+ return gimp_operation_hsv_saturation_legacy_process_pixels (in_buf, aux_buf, aux2_buf,
+ out_buf,
+ layer_mode->opacity,
+ samples, roi, level,
+ layer_mode->blend_trc,
+ layer_mode->composite_trc,
+ layer_mode->composite_mode);
}
gboolean
diff --git a/app/operations/layer-modes-legacy/gimpoperationhsvsaturationlegacy.h
b/app/operations/layer-modes-legacy/gimpoperationhsvsaturationlegacy.h
index e4f9c6a..683866f 100644
--- a/app/operations/layer-modes-legacy/gimpoperationhsvsaturationlegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationhsvsaturationlegacy.h
@@ -57,7 +57,7 @@ gboolean gimp_operation_hsv_saturation_legacy_process_pixels (gfloat
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
+ GimpLayerBlendTRC blend_trc,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes-legacy/gimpoperationhsvvaluelegacy.c
b/app/operations/layer-modes-legacy/gimpoperationhsvvaluelegacy.c
index 6424b11..7c41aa8 100644
--- a/app/operations/layer-modes-legacy/gimpoperationhsvvaluelegacy.c
+++ b/app/operations/layer-modes-legacy/gimpoperationhsvvaluelegacy.c
@@ -80,7 +80,13 @@ gimp_operation_hsv_value_legacy_process (GeglOperation *operation,
{
GimpOperationPointLayerMode *layer_mode = (GimpOperationPointLayerMode*)operation;
- return gimp_operation_hsv_value_legacy_process_pixels (in_buf, aux_buf, aux2_buf, out_buf,
layer_mode->opacity, samples, roi, level, layer_mode->blend_trc, layer_mode->composite_trc,
layer_mode->composite_mode);
+ return gimp_operation_hsv_value_legacy_process_pixels (in_buf, aux_buf, aux2_buf,
+ out_buf,
+ layer_mode->opacity,
+ samples, roi, level,
+ layer_mode->blend_trc,
+ layer_mode->composite_trc,
+ layer_mode->composite_mode);
}
gboolean
diff --git a/app/operations/layer-modes-legacy/gimpoperationhsvvaluelegacy.h
b/app/operations/layer-modes-legacy/gimpoperationhsvvaluelegacy.h
index 721362a..a4a03fe 100644
--- a/app/operations/layer-modes-legacy/gimpoperationhsvvaluelegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationhsvvaluelegacy.h
@@ -57,7 +57,7 @@ gboolean gimp_operation_hsv_value_legacy_process_pixels (gfloat *
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
+ GimpLayerBlendTRC blend_trc,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes-legacy/gimpoperationlightenonlylegacy.c
b/app/operations/layer-modes-legacy/gimpoperationlightenonlylegacy.c
index 628c924..694b040 100644
--- a/app/operations/layer-modes-legacy/gimpoperationlightenonlylegacy.c
+++ b/app/operations/layer-modes-legacy/gimpoperationlightenonlylegacy.c
@@ -76,7 +76,13 @@ gimp_operation_lighten_only_legacy_process (GeglOperation *operation,
{
GimpOperationPointLayerMode *layer_mode = (GimpOperationPointLayerMode*)operation;
- return gimp_operation_lighten_only_legacy_process_pixels (in_buf, aux_buf, aux2_buf, out_buf,
layer_mode->opacity, samples, roi, level, layer_mode->blend_trc, layer_mode->composite_trc,
layer_mode->composite_mode);
+ return gimp_operation_lighten_only_legacy_process_pixels (in_buf, aux_buf, aux2_buf,
+ out_buf,
+ layer_mode->opacity,
+ samples, roi, level,
+ layer_mode->blend_trc,
+ layer_mode->composite_trc,
+ layer_mode->composite_mode);
}
gboolean
diff --git a/app/operations/layer-modes-legacy/gimpoperationlightenonlylegacy.h
b/app/operations/layer-modes-legacy/gimpoperationlightenonlylegacy.h
index d37636c..a1d125f 100644
--- a/app/operations/layer-modes-legacy/gimpoperationlightenonlylegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationlightenonlylegacy.h
@@ -57,7 +57,7 @@ gboolean gimp_operation_lighten_only_legacy_process_pixels (gfloat
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
+ GimpLayerBlendTRC blend_trc,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes-legacy/gimpoperationmultiplylegacy.c
b/app/operations/layer-modes-legacy/gimpoperationmultiplylegacy.c
index bdfed8b..c08fba6 100644
--- a/app/operations/layer-modes-legacy/gimpoperationmultiplylegacy.c
+++ b/app/operations/layer-modes-legacy/gimpoperationmultiplylegacy.c
@@ -76,7 +76,13 @@ gimp_operation_multiply_legacy_process (GeglOperation *operation,
{
GimpOperationPointLayerMode *layer_mode = (GimpOperationPointLayerMode*)operation;
- return gimp_operation_multiply_legacy_process_pixels (in_buf, aux_buf, aux2_buf, out_buf,
layer_mode->opacity, samples, roi, level, layer_mode->blend_trc, layer_mode->composite_trc,
layer_mode->composite_mode);
+ return gimp_operation_multiply_legacy_process_pixels (in_buf, aux_buf, aux2_buf,
+ out_buf,
+ layer_mode->opacity,
+ samples, roi, level,
+ layer_mode->blend_trc,
+ layer_mode->composite_trc,
+ layer_mode->composite_mode);
}
gboolean
diff --git a/app/operations/layer-modes-legacy/gimpoperationmultiplylegacy.h
b/app/operations/layer-modes-legacy/gimpoperationmultiplylegacy.h
index 299e280..a902588 100644
--- a/app/operations/layer-modes-legacy/gimpoperationmultiplylegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationmultiplylegacy.h
@@ -57,7 +57,7 @@ gboolean gimp_operation_multiply_legacy_process_pixels (gfloat *i
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
+ GimpLayerBlendTRC blend_trc,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes-legacy/gimpoperationscreenlegacy.c
b/app/operations/layer-modes-legacy/gimpoperationscreenlegacy.c
index 9023c9a..464833e 100644
--- a/app/operations/layer-modes-legacy/gimpoperationscreenlegacy.c
+++ b/app/operations/layer-modes-legacy/gimpoperationscreenlegacy.c
@@ -76,21 +76,27 @@ gimp_operation_screen_legacy_process (GeglOperation *operation,
{
GimpOperationPointLayerMode *layer_mode = (GimpOperationPointLayerMode*)operation;
- return gimp_operation_screen_legacy_process_pixels (in_buf, aux_buf, aux2_buf, out_buf,
layer_mode->opacity, samples, roi, level, layer_mode->blend_trc, layer_mode->composite_trc,
layer_mode->composite_mode);
+ return gimp_operation_screen_legacy_process_pixels (in_buf, aux_buf, aux2_buf,
+ out_buf,
+ layer_mode->opacity,
+ samples, roi, level,
+ layer_mode->blend_trc,
+ layer_mode->composite_trc,
+ layer_mode->composite_mode);
}
gboolean
-gimp_operation_screen_legacy_process_pixels (gfloat *in,
- gfloat *layer,
- gfloat *mask,
- gfloat *out,
- gfloat opacity,
- glong samples,
- const GeglRectangle *roi,
- gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
- GimpLayerCompositeMode composite_mode)
+gimp_operation_screen_legacy_process_pixels (gfloat *in,
+ gfloat *layer,
+ gfloat *mask,
+ gfloat *out,
+ gfloat opacity,
+ glong samples,
+ const GeglRectangle *roi,
+ gint level,
+ GimpLayerBlendTRC blend_trc,
+ GimpLayerBlendTRC composite_trc,
+ GimpLayerCompositeMode composite_mode)
{
const gboolean has_mask = mask != NULL;
diff --git a/app/operations/layer-modes-legacy/gimpoperationscreenlegacy.h
b/app/operations/layer-modes-legacy/gimpoperationscreenlegacy.h
index 319d10f..ea941b7 100644
--- a/app/operations/layer-modes-legacy/gimpoperationscreenlegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationscreenlegacy.h
@@ -57,7 +57,7 @@ gboolean gimp_operation_screen_legacy_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
+ GimpLayerBlendTRC blend_trc,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes-legacy/gimpoperationsubtractlegacy.c
b/app/operations/layer-modes-legacy/gimpoperationsubtractlegacy.c
index 7c6e237..5078876 100644
--- a/app/operations/layer-modes-legacy/gimpoperationsubtractlegacy.c
+++ b/app/operations/layer-modes-legacy/gimpoperationsubtractlegacy.c
@@ -76,7 +76,13 @@ gimp_operation_subtract_legacy_process (GeglOperation *operation,
{
GimpOperationPointLayerMode *layer_mode = (GimpOperationPointLayerMode*)operation;
- return gimp_operation_subtract_legacy_process_pixels (in_buf, aux_buf, aux2_buf, out_buf,
layer_mode->opacity, samples, roi, level, layer_mode->blend_trc, layer_mode->composite_trc,
layer_mode->composite_mode);
+ return gimp_operation_subtract_legacy_process_pixels (in_buf, aux_buf, aux2_buf,
+ out_buf,
+ layer_mode->opacity,
+ samples, roi, level,
+ layer_mode->blend_trc,
+ layer_mode->composite_trc,
+ layer_mode->composite_mode);
}
gboolean
diff --git a/app/operations/layer-modes-legacy/gimpoperationsubtractlegacy.h
b/app/operations/layer-modes-legacy/gimpoperationsubtractlegacy.h
index 59299ca..e59ebaa 100644
--- a/app/operations/layer-modes-legacy/gimpoperationsubtractlegacy.h
+++ b/app/operations/layer-modes-legacy/gimpoperationsubtractlegacy.h
@@ -57,7 +57,7 @@ gboolean gimp_operation_subtract_legacy_process_pixels (gfloat *i
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
+ GimpLayerBlendTRC blend_trc,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes/gimpblendcomposite.h b/app/operations/layer-modes/gimpblendcomposite.h
index 983b0a1..9df6cd1 100644
--- a/app/operations/layer-modes/gimpblendcomposite.h
+++ b/app/operations/layer-modes/gimpblendcomposite.h
@@ -20,6 +20,13 @@
#define __GIMP_BLEND_COMPOSITE_H__
+#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpmath/gimpmath.h"
+
+
extern const Babl *_gimp_fish_rgba_to_perceptual;
extern const Babl *_gimp_fish_perceptual_to_rgba;
extern const Babl *_gimp_fish_perceptual_to_laba;
diff --git a/app/operations/layer-modes/gimpoperationaddition.c
b/app/operations/layer-modes/gimpoperationaddition.c
index bd0bf7c..45ba98c 100644
--- a/app/operations/layer-modes/gimpoperationaddition.c
+++ b/app/operations/layer-modes/gimpoperationaddition.c
@@ -78,9 +78,12 @@ gimp_operation_addition_process (GeglOperation *operation,
{
GimpOperationPointLayerMode *layer_mode = (GimpOperationPointLayerMode*)operation;
return gimp_operation_addition_process_pixels (in_buf, aux_buf, aux2_buf,
- out_buf, layer_mode->opacity, samples, roi, level,
- layer_mode->blend_trc, layer_mode->composite_trc,
- layer_mode->composite_mode);
+ out_buf,
+ layer_mode->opacity,
+ samples, roi, level,
+ layer_mode->blend_trc,
+ layer_mode->composite_trc,
+ layer_mode->composite_mode);
}
gboolean
@@ -101,4 +104,3 @@ gimp_operation_addition_process_pixels (gfloat *in,
blendfun_addition);
return TRUE;
}
-
diff --git a/app/operations/layer-modes/gimpoperationaddition.h
b/app/operations/layer-modes/gimpoperationaddition.h
index 01f24bd..91c5187 100644
--- a/app/operations/layer-modes/gimpoperationaddition.h
+++ b/app/operations/layer-modes/gimpoperationaddition.h
@@ -58,7 +58,7 @@ gboolean gimp_operation_addition_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
+ GimpLayerBlendTRC blend_trc,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes/gimpoperationantierase.c
b/app/operations/layer-modes/gimpoperationantierase.c
index 40c1585..b710fec 100644
--- a/app/operations/layer-modes/gimpoperationantierase.c
+++ b/app/operations/layer-modes/gimpoperationantierase.c
@@ -89,7 +89,13 @@ gimp_operation_anti_erase_process (GeglOperation *operation,
{
GimpOperationPointLayerMode *layer_mode = (void*)operation;
- return gimp_operation_anti_erase_process_pixels (in_buf, aux_buf, aux2_buf, out_buf, layer_mode->opacity,
samples, roi, level, layer_mode->blend_trc, layer_mode->composite_trc, layer_mode->composite_mode);
+ return gimp_operation_anti_erase_process_pixels (in_buf, aux_buf, aux2_buf,
+ out_buf,
+ layer_mode->opacity,
+ samples, roi, level,
+ layer_mode->blend_trc,
+ layer_mode->composite_trc,
+ layer_mode->composite_mode);
}
gboolean
diff --git a/app/operations/layer-modes/gimpoperationantierase.h
b/app/operations/layer-modes/gimpoperationantierase.h
index 58e2d41..e1926df 100644
--- a/app/operations/layer-modes/gimpoperationantierase.h
+++ b/app/operations/layer-modes/gimpoperationantierase.h
@@ -57,7 +57,7 @@ gboolean gimp_operation_anti_erase_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
+ GimpLayerBlendTRC blend_trc,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes/gimpoperationbehind.c
b/app/operations/layer-modes/gimpoperationbehind.c
index cdd58c3..2a10358 100644
--- a/app/operations/layer-modes/gimpoperationbehind.c
+++ b/app/operations/layer-modes/gimpoperationbehind.c
@@ -76,10 +76,13 @@ gimp_operation_behind_process (GeglOperation *operation,
{
GimpOperationPointLayerMode *layer_mode = (void*)operation;
- return gimp_operation_behind_process_pixels (in_buf, aux_buf, aux2_buf,
- out_buf, layer_mode->opacity, samples, roi, level,
- layer_mode->blend_trc, layer_mode->composite_trc,
- layer_mode->composite_mode);
+ return gimp_operation_behind_process_pixels (in_buf, aux_buf, aux2_buf,
+ out_buf,
+ layer_mode->opacity,
+ samples, roi, level,
+ layer_mode->blend_trc,
+ layer_mode->composite_trc,
+ layer_mode->composite_mode);
}
gboolean
diff --git a/app/operations/layer-modes/gimpoperationbehind.h
b/app/operations/layer-modes/gimpoperationbehind.h
index 764f7f6..191c8b5 100644
--- a/app/operations/layer-modes/gimpoperationbehind.h
+++ b/app/operations/layer-modes/gimpoperationbehind.h
@@ -57,7 +57,7 @@ gboolean gimp_operation_behind_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
+ GimpLayerBlendTRC blend_trc,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes/gimpoperationburn.c b/app/operations/layer-modes/gimpoperationburn.c
index b73df72..10ed4a8 100644
--- a/app/operations/layer-modes/gimpoperationburn.c
+++ b/app/operations/layer-modes/gimpoperationburn.c
@@ -78,10 +78,13 @@ gimp_operation_burn_process (GeglOperation *operation,
GimpOperationPointLayerMode *layer_mode = (void*)operation;
return gimp_operation_burn_process_pixels (in_buf, aux_buf, aux2_buf,
- out_buf, layer_mode->opacity, samples, roi, level,
- layer_mode->blend_trc, layer_mode->composite_mode,
- layer_mode->composite_mode);
-}
+ out_buf,
+ layer_mode->opacity,
+ samples, roi, level,
+ layer_mode->blend_trc,
+ layer_mode->composite_mode,
+ layer_mode->composite_mode);
+}
gboolean
diff --git a/app/operations/layer-modes/gimpoperationburn.h b/app/operations/layer-modes/gimpoperationburn.h
index 3804e22..7940e00 100644
--- a/app/operations/layer-modes/gimpoperationburn.h
+++ b/app/operations/layer-modes/gimpoperationburn.h
@@ -58,7 +58,7 @@ gboolean gimp_operation_burn_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
+ GimpLayerBlendTRC blend_trc,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes/gimpoperationcolorerase.c
b/app/operations/layer-modes/gimpoperationcolorerase.c
index 06b8fec..5ed15fa 100644
--- a/app/operations/layer-modes/gimpoperationcolorerase.c
+++ b/app/operations/layer-modes/gimpoperationcolorerase.c
@@ -80,7 +80,13 @@ gimp_operation_color_erase_process (GeglOperation *operation,
{
GimpOperationPointLayerMode *layer_mode = (void*)operation;
- return gimp_operation_color_erase_process_pixels (in_buf, aux_buf, aux2_buf, out_buf, layer_mode->opacity,
samples, roi, level, layer_mode->blend_trc, layer_mode->composite_trc, layer_mode->composite_mode);
+ return gimp_operation_color_erase_process_pixels (in_buf, aux_buf, aux2_buf,
+ out_buf,
+ layer_mode->opacity,
+ samples, roi, level,
+ layer_mode->blend_trc,
+ layer_mode->composite_trc,
+ layer_mode->composite_mode);
}
gboolean
diff --git a/app/operations/layer-modes/gimpoperationcolorerase.h
b/app/operations/layer-modes/gimpoperationcolorerase.h
index b4208b0..597eed0 100644
--- a/app/operations/layer-modes/gimpoperationcolorerase.h
+++ b/app/operations/layer-modes/gimpoperationcolorerase.h
@@ -57,7 +57,7 @@ gboolean gimp_operation_color_erase_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
+ GimpLayerBlendTRC blend_trc,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes/gimpoperationdarkenonly.c
b/app/operations/layer-modes/gimpoperationdarkenonly.c
index ff61d54..5efb5f1 100644
--- a/app/operations/layer-modes/gimpoperationdarkenonly.c
+++ b/app/operations/layer-modes/gimpoperationdarkenonly.c
@@ -78,7 +78,13 @@ gimp_operation_darken_only_process (GeglOperation *operation,
{
GimpOperationPointLayerMode *layer_mode = (void*)operation;
- return gimp_operation_darken_only_process_pixels (in_buf, aux_buf, aux2_buf, out_buf, layer_mode->opacity,
samples, roi, level, layer_mode->blend_trc, layer_mode->composite_trc, layer_mode->composite_mode);
+ return gimp_operation_darken_only_process_pixels (in_buf, aux_buf, aux2_buf,
+ out_buf,
+ layer_mode->opacity,
+ samples, roi, level,
+ layer_mode->blend_trc,
+ layer_mode->composite_trc,
+ layer_mode->composite_mode);
}
gboolean
@@ -95,6 +101,7 @@ gimp_operation_darken_only_process_pixels (gfloat *in,
GimpLayerCompositeMode composite_mode)
{
gimp_composite_blend (in, layer, mask, out, opacity, samples,
- blend_trc, composite_trc, composite_mode, blendfun_darken_only);
+ blend_trc, composite_trc, composite_mode,
+ blendfun_darken_only);
return TRUE;
}
diff --git a/app/operations/layer-modes/gimpoperationdarkenonly.h
b/app/operations/layer-modes/gimpoperationdarkenonly.h
index 8ece2ec..3baee1e 100644
--- a/app/operations/layer-modes/gimpoperationdarkenonly.h
+++ b/app/operations/layer-modes/gimpoperationdarkenonly.h
@@ -58,7 +58,7 @@ gboolean gimp_operation_darken_only_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
+ GimpLayerBlendTRC blend_trc,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes/gimpoperationdifference.c
b/app/operations/layer-modes/gimpoperationdifference.c
index 58646fb..682306d 100644
--- a/app/operations/layer-modes/gimpoperationdifference.c
+++ b/app/operations/layer-modes/gimpoperationdifference.c
@@ -78,7 +78,13 @@ gimp_operation_difference_process (GeglOperation *operation,
{
GimpOperationPointLayerMode *layer_mode = (void*)operation;
- return gimp_operation_difference_process_pixels (in_buf, aux_buf, aux2_buf, out_buf, layer_mode->opacity,
samples, roi, level, layer_mode->blend_trc, layer_mode->composite_trc, layer_mode->composite_mode);
+ return gimp_operation_difference_process_pixels (in_buf, aux_buf, aux2_buf,
+ out_buf,
+ layer_mode->opacity,
+ samples, roi, level,
+ layer_mode->blend_trc,
+ layer_mode->composite_trc,
+ layer_mode->composite_mode);
}
gboolean
@@ -94,7 +100,8 @@ gimp_operation_difference_process_pixels (gfloat *in,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode)
{
- gimp_composite_blend (in, layer, mask, out, opacity, samples, blend_trc,
- composite_trc, composite_mode, blendfun_difference);
+ gimp_composite_blend (in, layer, mask, out, opacity, samples,
+ blend_trc, composite_trc, composite_mode,
+ blendfun_difference);
return TRUE;
}
diff --git a/app/operations/layer-modes/gimpoperationdifference.h
b/app/operations/layer-modes/gimpoperationdifference.h
index dfe1aa5..85768a5 100644
--- a/app/operations/layer-modes/gimpoperationdifference.h
+++ b/app/operations/layer-modes/gimpoperationdifference.h
@@ -51,16 +51,16 @@ struct _GimpOperationDifferenceClass
GType gimp_operation_difference_get_type (void) G_GNUC_CONST;
-gboolean gimp_operation_difference_process_pixels (gfloat *in,
- gfloat *layer,
- gfloat *mask,
- gfloat *out,
- gfloat opacity,
- glong samples,
- const GeglRectangle *roi,
- gint level,
- GimpLayerBlendTRC blend_trc,
- GimpLayerBlendTRC composite_trc,
+gboolean gimp_operation_difference_process_pixels (gfloat *in,
+ gfloat *layer,
+ gfloat *mask,
+ gfloat *out,
+ gfloat opacity,
+ glong samples,
+ const GeglRectangle *roi,
+ gint level,
+ GimpLayerBlendTRC blend_trc,
+ GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes/gimpoperationdissolve.c
b/app/operations/layer-modes/gimpoperationdissolve.c
index 38afe83..0097f91 100644
--- a/app/operations/layer-modes/gimpoperationdissolve.c
+++ b/app/operations/layer-modes/gimpoperationdissolve.c
@@ -92,7 +92,13 @@ gimp_operation_dissolve_process (GeglOperation *operation,
{
GimpOperationPointLayerMode *layer_mode = (void*) operation;
- return gimp_operation_dissolve_process_pixels (in_buf, aux_buf, aux2_buf, out_buf, layer_mode->opacity,
samples, result, level, layer_mode->blend_trc, layer_mode->composite_trc, layer_mode->composite_mode);
+ return gimp_operation_dissolve_process_pixels (in_buf, aux_buf, aux2_buf,
+ out_buf,
+ layer_mode->opacity,
+ samples, result, level,
+ layer_mode->blend_trc,
+ layer_mode->composite_trc,
+ layer_mode->composite_mode);
}
gboolean
diff --git a/app/operations/layer-modes/gimpoperationdissolve.h
b/app/operations/layer-modes/gimpoperationdissolve.h
index 8b5842f..af06749 100644
--- a/app/operations/layer-modes/gimpoperationdissolve.h
+++ b/app/operations/layer-modes/gimpoperationdissolve.h
@@ -57,7 +57,7 @@ gboolean gimp_operation_dissolve_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *result,
gint level,
- GimpLayerBlendTRC blend_trc,
+ GimpLayerBlendTRC blend_trc,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes/gimpoperationdivide.c
b/app/operations/layer-modes/gimpoperationdivide.c
index 5b3795f..76cc085 100644
--- a/app/operations/layer-modes/gimpoperationdivide.c
+++ b/app/operations/layer-modes/gimpoperationdivide.c
@@ -78,7 +78,13 @@ gimp_operation_divide_process (GeglOperation *operation,
{
GimpOperationPointLayerMode *layer_mode = (void*)operation;
- return gimp_operation_divide_process_pixels (in_buf, aux_buf, aux2_buf, out_buf, layer_mode->opacity,
samples, roi, level, layer_mode->blend_trc, layer_mode->composite_trc, layer_mode->composite_mode);
+ return gimp_operation_divide_process_pixels (in_buf, aux_buf, aux2_buf,
+ out_buf,
+ layer_mode->opacity,
+ samples, roi, level,
+ layer_mode->blend_trc,
+ layer_mode->composite_trc,
+ layer_mode->composite_mode);
}
gboolean
@@ -94,7 +100,8 @@ gimp_operation_divide_process_pixels (gfloat *in,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode)
{
- gimp_composite_blend (in, layer, mask, out, opacity, samples,
- blend_trc, composite_trc, composite_mode, blendfun_divide);
+ gimp_composite_blend (in, layer, mask, out, opacity, samples,
+ blend_trc, composite_trc, composite_mode,
+ blendfun_divide);
return TRUE;
}
diff --git a/app/operations/layer-modes/gimpoperationdivide.h
b/app/operations/layer-modes/gimpoperationdivide.h
index 2094f09..51290ce 100644
--- a/app/operations/layer-modes/gimpoperationdivide.h
+++ b/app/operations/layer-modes/gimpoperationdivide.h
@@ -58,7 +58,7 @@ gboolean gimp_operation_divide_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
+ GimpLayerBlendTRC blend_trc,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes/gimpoperationdodge.c b/app/operations/layer-modes/gimpoperationdodge.c
index fb29698..85878a5 100644
--- a/app/operations/layer-modes/gimpoperationdodge.c
+++ b/app/operations/layer-modes/gimpoperationdodge.c
@@ -78,7 +78,13 @@ gimp_operation_dodge_process (GeglOperation *operation,
{
GimpOperationPointLayerMode *layer_mode = (void*)operation;
- return gimp_operation_dodge_process_pixels (in_buf, aux_buf, aux2_buf, out_buf, layer_mode->opacity,
samples, roi, level, layer_mode->blend_trc, layer_mode->composite_trc, layer_mode->composite_mode);
+ return gimp_operation_dodge_process_pixels (in_buf, aux_buf, aux2_buf,
+ out_buf,
+ layer_mode->opacity,
+ samples, roi, level,
+ layer_mode->blend_trc,
+ layer_mode->composite_trc,
+ layer_mode->composite_mode);
}
gboolean
@@ -95,6 +101,7 @@ gimp_operation_dodge_process_pixels (gfloat *in,
GimpLayerCompositeMode composite_mode)
{
gimp_composite_blend (in, layer, mask, out, opacity, samples,
- blend_trc, composite_trc, composite_mode, blendfun_dodge);
+ blend_trc, composite_trc, composite_mode,
+ blendfun_dodge);
return TRUE;
}
diff --git a/app/operations/layer-modes/gimpoperationdodge.h b/app/operations/layer-modes/gimpoperationdodge.h
index fe2e179..5e1f18d 100644
--- a/app/operations/layer-modes/gimpoperationdodge.h
+++ b/app/operations/layer-modes/gimpoperationdodge.h
@@ -58,7 +58,7 @@ gboolean gimp_operation_dodge_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
+ GimpLayerBlendTRC blend_trc,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes/gimpoperationerase.c b/app/operations/layer-modes/gimpoperationerase.c
index 922df8f..8f6a51c 100644
--- a/app/operations/layer-modes/gimpoperationerase.c
+++ b/app/operations/layer-modes/gimpoperationerase.c
@@ -89,7 +89,13 @@ gimp_operation_erase_process (GeglOperation *operation,
{
GimpOperationPointLayerMode *layer_mode = (GimpOperationPointLayerMode*)operation;
- return gimp_operation_erase_process_pixels (in_buf, aux_buf, aux2_buf, out_buf, layer_mode->opacity,
samples, roi, level, layer_mode->blend_trc, layer_mode->composite_trc, layer_mode->composite_mode);
+ return gimp_operation_erase_process_pixels (in_buf, aux_buf, aux2_buf,
+ out_buf,
+ layer_mode->opacity,
+ samples, roi, level,
+ layer_mode->blend_trc,
+ layer_mode->composite_trc,
+ layer_mode->composite_mode);
}
gboolean
diff --git a/app/operations/layer-modes/gimpoperationerase.h b/app/operations/layer-modes/gimpoperationerase.h
index dcbd93e..d9f5caf 100644
--- a/app/operations/layer-modes/gimpoperationerase.h
+++ b/app/operations/layer-modes/gimpoperationerase.h
@@ -57,7 +57,7 @@ gboolean gimp_operation_erase_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
+ GimpLayerBlendTRC blend_trc,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes/gimpoperationgrainextract.c
b/app/operations/layer-modes/gimpoperationgrainextract.c
index c23659d..e044703 100644
--- a/app/operations/layer-modes/gimpoperationgrainextract.c
+++ b/app/operations/layer-modes/gimpoperationgrainextract.c
@@ -77,7 +77,13 @@ gimp_operation_grain_extract_process (GeglOperation *operation,
gint level)
{
GimpOperationPointLayerMode *layer_mode = (GimpOperationPointLayerMode*)operation;
- return gimp_operation_grain_extract_process_pixels (in_buf, aux_buf, aux2_buf, out_buf,
layer_mode->opacity, samples, roi, level, layer_mode->blend_trc, layer_mode->composite_trc,
layer_mode->composite_mode);
+ return gimp_operation_grain_extract_process_pixels (in_buf, aux_buf, aux2_buf,
+ out_buf,
+ layer_mode->opacity,
+ samples, roi, level,
+ layer_mode->blend_trc,
+ layer_mode->composite_trc,
+ layer_mode->composite_mode);
}
gboolean
@@ -93,7 +99,8 @@ gimp_operation_grain_extract_process_pixels (gfloat *in,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode)
{
- gimp_composite_blend (in, layer, mask, out, opacity, samples, blend_trc,
- composite_trc, composite_mode, blendfun_grain_extract);
+ gimp_composite_blend (in, layer, mask, out, opacity, samples,
+ blend_trc, composite_trc, composite_mode,
+ blendfun_grain_extract);
return TRUE;
}
diff --git a/app/operations/layer-modes/gimpoperationgrainextract.h
b/app/operations/layer-modes/gimpoperationgrainextract.h
index 3bde1fb..667b30b 100644
--- a/app/operations/layer-modes/gimpoperationgrainextract.h
+++ b/app/operations/layer-modes/gimpoperationgrainextract.h
@@ -58,7 +58,7 @@ gboolean gimp_operation_grain_extract_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
+ GimpLayerBlendTRC blend_trc,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes/gimpoperationgrainmerge.c
b/app/operations/layer-modes/gimpoperationgrainmerge.c
index 813742f..937d1c8 100644
--- a/app/operations/layer-modes/gimpoperationgrainmerge.c
+++ b/app/operations/layer-modes/gimpoperationgrainmerge.c
@@ -77,7 +77,13 @@ gimp_operation_grain_merge_process (GeglOperation *operation,
gint level)
{
GimpOperationPointLayerMode *layer_mode = (GimpOperationPointLayerMode*)operation;
- return gimp_operation_grain_merge_process_pixels (in_buf, aux_buf, aux2_buf, out_buf, layer_mode->opacity,
samples, roi, level, layer_mode->blend_trc, layer_mode->composite_trc, layer_mode->composite_mode);
+ return gimp_operation_grain_merge_process_pixels (in_buf, aux_buf, aux2_buf,
+ out_buf,
+ layer_mode->opacity,
+ samples, roi, level,
+ layer_mode->blend_trc,
+ layer_mode->composite_trc,
+ layer_mode->composite_mode);
}
gboolean
@@ -93,7 +99,8 @@ gimp_operation_grain_merge_process_pixels (gfloat *in,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode)
{
- gimp_composite_blend (in, layer, mask, out, opacity, samples, blend_trc,
- composite_trc, composite_mode, blendfun_grain_merge);
+ gimp_composite_blend (in, layer, mask, out, opacity, samples,
+ blend_trc, composite_trc, composite_mode,
+ blendfun_grain_merge);
return TRUE;
}
diff --git a/app/operations/layer-modes/gimpoperationgrainmerge.h
b/app/operations/layer-modes/gimpoperationgrainmerge.h
index 83fd4d6..a4a9438 100644
--- a/app/operations/layer-modes/gimpoperationgrainmerge.h
+++ b/app/operations/layer-modes/gimpoperationgrainmerge.h
@@ -58,7 +58,7 @@ gboolean gimp_operation_grain_merge_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
+ GimpLayerBlendTRC blend_trc,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes/gimpoperationhardlight.c
b/app/operations/layer-modes/gimpoperationhardlight.c
index 0ada97f..bc15ab4 100644
--- a/app/operations/layer-modes/gimpoperationhardlight.c
+++ b/app/operations/layer-modes/gimpoperationhardlight.c
@@ -77,7 +77,13 @@ gimp_operation_hardlight_process (GeglOperation *operation,
{
GimpOperationPointLayerMode *layer_mode = (GimpOperationPointLayerMode*)operation;
- return gimp_operation_hardlight_process_pixels (in_buf, aux_buf, aux2_buf, out_buf, layer_mode->opacity,
samples, roi, level, layer_mode->blend_trc, layer_mode->composite_trc, layer_mode->composite_mode);
+ return gimp_operation_hardlight_process_pixels (in_buf, aux_buf, aux2_buf,
+ out_buf,
+ layer_mode->opacity,
+ samples, roi, level,
+ layer_mode->blend_trc,
+ layer_mode->composite_trc,
+ layer_mode->composite_mode);
}
gboolean
@@ -94,6 +100,7 @@ gimp_operation_hardlight_process_pixels (gfloat *in,
GimpLayerCompositeMode composite_mode)
{
gimp_composite_blend (in, layer, mask, out, opacity, samples,
- blend_trc, composite_trc, composite_mode, blendfun_hardlight);
+ blend_trc, composite_trc, composite_mode,
+ blendfun_hardlight);
return TRUE;
}
diff --git a/app/operations/layer-modes/gimpoperationhardlight.h
b/app/operations/layer-modes/gimpoperationhardlight.h
index fe1031e..8ded0f3 100644
--- a/app/operations/layer-modes/gimpoperationhardlight.h
+++ b/app/operations/layer-modes/gimpoperationhardlight.h
@@ -57,7 +57,7 @@ gboolean gimp_operation_hardlight_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
+ GimpLayerBlendTRC blend_trc,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes/gimpoperationhsvcolor.c
b/app/operations/layer-modes/gimpoperationhsvcolor.c
index 401be9b..24a3da9 100644
--- a/app/operations/layer-modes/gimpoperationhsvcolor.c
+++ b/app/operations/layer-modes/gimpoperationhsvcolor.c
@@ -82,7 +82,13 @@ gimp_operation_hsv_color_process (GeglOperation *operation,
{
GimpOperationPointLayerMode *layer_mode = (GimpOperationPointLayerMode*)operation;
- return gimp_operation_hsv_color_process_pixels (in_buf, aux_buf, aux2_buf, out_buf, layer_mode->opacity,
samples, roi, level, layer_mode->blend_trc, layer_mode->composite_trc, layer_mode->composite_mode);
+ return gimp_operation_hsv_color_process_pixels (in_buf, aux_buf, aux2_buf,
+ out_buf,
+ layer_mode->opacity,
+ samples, roi, level,
+ layer_mode->blend_trc,
+ layer_mode->composite_trc,
+ layer_mode->composite_mode);
}
gboolean
@@ -99,6 +105,7 @@ gimp_operation_hsv_color_process_pixels (gfloat *in,
GimpLayerCompositeMode composite_mode)
{
gimp_composite_blend (in, layer, mask, out, opacity, samples,
- blend_trc, composite_trc, composite_mode, blendfun_hsv_color);
+ blend_trc, composite_trc, composite_mode,
+ blendfun_hsv_color);
return TRUE;
}
diff --git a/app/operations/layer-modes/gimpoperationhsvcolor.h
b/app/operations/layer-modes/gimpoperationhsvcolor.h
index 2b825b4..71909d4 100644
--- a/app/operations/layer-modes/gimpoperationhsvcolor.h
+++ b/app/operations/layer-modes/gimpoperationhsvcolor.h
@@ -58,7 +58,7 @@ gboolean gimp_operation_hsv_color_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
+ GimpLayerBlendTRC blend_trc,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes/gimpoperationhsvhue.c
b/app/operations/layer-modes/gimpoperationhsvhue.c
index 54865df..0ab0d79 100644
--- a/app/operations/layer-modes/gimpoperationhsvhue.c
+++ b/app/operations/layer-modes/gimpoperationhsvhue.c
@@ -82,7 +82,13 @@ gimp_operation_hsv_hue_process (GeglOperation *operation,
{
GimpOperationPointLayerMode *layer_mode = (GimpOperationPointLayerMode*)operation;
- return gimp_operation_hsv_hue_process_pixels (in_buf, aux_buf, aux2_buf, out_buf, layer_mode->opacity,
samples, roi, level, layer_mode->blend_trc, layer_mode->composite_trc, layer_mode->composite_mode);
+ return gimp_operation_hsv_hue_process_pixels (in_buf, aux_buf, aux2_buf,
+ out_buf,
+ layer_mode->opacity,
+ samples, roi, level,
+ layer_mode->blend_trc,
+ layer_mode->composite_trc,
+ layer_mode->composite_mode);
}
gboolean
@@ -98,7 +104,8 @@ gimp_operation_hsv_hue_process_pixels (gfloat *in,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode)
{
- gimp_composite_blend (in, layer, mask, out, opacity, samples, blend_trc,
- composite_trc, composite_mode, blendfun_hsv_hue);
+ gimp_composite_blend (in, layer, mask, out, opacity, samples,
+ blend_trc, composite_trc, composite_mode,
+ blendfun_hsv_hue);
return TRUE;
}
diff --git a/app/operations/layer-modes/gimpoperationhsvhue.h
b/app/operations/layer-modes/gimpoperationhsvhue.h
index 15a37ae..5f81f96 100644
--- a/app/operations/layer-modes/gimpoperationhsvhue.h
+++ b/app/operations/layer-modes/gimpoperationhsvhue.h
@@ -58,7 +58,7 @@ gboolean gimp_operation_hsv_hue_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
+ GimpLayerBlendTRC blend_trc,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes/gimpoperationhsvsaturation.c
b/app/operations/layer-modes/gimpoperationhsvsaturation.c
index 35d7b52..bb40040 100644
--- a/app/operations/layer-modes/gimpoperationhsvsaturation.c
+++ b/app/operations/layer-modes/gimpoperationhsvsaturation.c
@@ -81,7 +81,13 @@ gimp_operation_hsv_saturation_process (GeglOperation *operation,
gint level)
{
GimpOperationPointLayerMode *layer_mode = (GimpOperationPointLayerMode*)operation;
- return gimp_operation_hsv_saturation_process_pixels (in_buf, aux_buf, aux2_buf, out_buf,
layer_mode->opacity, samples, roi, level, layer_mode->blend_trc, layer_mode->composite_trc,
layer_mode->composite_mode);
+ return gimp_operation_hsv_saturation_process_pixels (in_buf, aux_buf, aux2_buf,
+ out_buf,
+ layer_mode->opacity,
+ samples, roi, level,
+ layer_mode->blend_trc,
+ layer_mode->composite_trc,
+ layer_mode->composite_mode);
}
gboolean
@@ -98,6 +104,7 @@ gimp_operation_hsv_saturation_process_pixels (gfloat *in,
GimpLayerCompositeMode composite_mode)
{
gimp_composite_blend (in, layer, mask, out, opacity, samples,
- blend_trc, composite_trc, composite_mode, blendfun_hsv_saturation);
+ blend_trc, composite_trc, composite_mode,
+ blendfun_hsv_saturation);
return TRUE;
}
diff --git a/app/operations/layer-modes/gimpoperationhsvsaturation.h
b/app/operations/layer-modes/gimpoperationhsvsaturation.h
index 7777e62..d9274e7 100644
--- a/app/operations/layer-modes/gimpoperationhsvsaturation.h
+++ b/app/operations/layer-modes/gimpoperationhsvsaturation.h
@@ -58,7 +58,7 @@ gboolean gimp_operation_hsv_saturation_process_pixels (gfloat *in
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
+ GimpLayerBlendTRC blend_trc,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes/gimpoperationhsvvalue.c
b/app/operations/layer-modes/gimpoperationhsvvalue.c
index d37e75a..35dfe5b 100644
--- a/app/operations/layer-modes/gimpoperationhsvvalue.c
+++ b/app/operations/layer-modes/gimpoperationhsvvalue.c
@@ -81,7 +81,13 @@ gimp_operation_hsv_value_process (GeglOperation *operation,
gint level)
{
GimpOperationPointLayerMode *layer_mode = (GimpOperationPointLayerMode*)operation;
- return gimp_operation_hsv_value_process_pixels (in_buf, aux_buf, aux2_buf, out_buf, layer_mode->opacity,
samples, roi, level, layer_mode->blend_trc, layer_mode->composite_trc, layer_mode->composite_mode);
+ return gimp_operation_hsv_value_process_pixels (in_buf, aux_buf, aux2_buf,
+ out_buf,
+ layer_mode->opacity,
+ samples, roi, level,
+ layer_mode->blend_trc,
+ layer_mode->composite_trc,
+ layer_mode->composite_mode);
}
gboolean
@@ -97,7 +103,8 @@ gimp_operation_hsv_value_process_pixels (gfloat *in,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode)
{
- gimp_composite_blend (in, layer, mask, out, opacity, samples, blend_trc,
- composite_trc, composite_mode, blendfun_hsv_value);
+ gimp_composite_blend (in, layer, mask, out, opacity, samples,
+ blend_trc, composite_trc, composite_mode,
+ blendfun_hsv_value);
return TRUE;
}
diff --git a/app/operations/layer-modes/gimpoperationhsvvalue.h
b/app/operations/layer-modes/gimpoperationhsvvalue.h
index ab81972..8fa9104 100644
--- a/app/operations/layer-modes/gimpoperationhsvvalue.h
+++ b/app/operations/layer-modes/gimpoperationhsvvalue.h
@@ -58,7 +58,7 @@ gboolean gimp_operation_hsv_value_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
+ GimpLayerBlendTRC blend_trc,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes/gimpoperationlchchroma.c
b/app/operations/layer-modes/gimpoperationlchchroma.c
index 35f206f..433afa7 100644
--- a/app/operations/layer-modes/gimpoperationlchchroma.c
+++ b/app/operations/layer-modes/gimpoperationlchchroma.c
@@ -22,12 +22,15 @@
*/
#include "config.h"
+
#include <gegl-plugin.h>
-#include <math.h>
+
#include "../operations-types.h"
+
#include "gimpoperationlchchroma.h"
#include "gimpblendcomposite.h"
+
static gboolean gimp_operation_lch_chroma_process (GeglOperation *operation,
void *in_buf,
void *aux_buf,
@@ -84,7 +87,13 @@ gimp_operation_lch_chroma_process (GeglOperation *operation,
return (linear ? gimp_operation_lch_chroma_process_pixels_linear :
gimp_operation_lch_chroma_process_pixels)
- (in_buf, aux_buf, aux2_buf, out_buf, opacity, samples, roi, level, gimp_op->blend_trc,
gimp_op->composite_trc, gimp_op->composite_mode);
+ (in_buf, aux_buf, aux2_buf,
+ out_buf,
+ opacity,
+ samples, roi, level,
+ gimp_op->blend_trc,
+ gimp_op->composite_trc,
+ gimp_op->composite_mode);
}
static void
@@ -139,7 +148,7 @@ gimp_operation_lch_chroma_process_pixels (gfloat *in,
{
static const Babl *from_fish = NULL;
static const Babl *to_fish = NULL;
-
+
if (!from_fish)
from_fish = babl_fish ("R'G'B'A float", "CIE Lab alpha float");
if (!to_fish)
@@ -164,7 +173,8 @@ gimp_operation_lch_chroma_process_pixels_linear (gfloat *in,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode)
{
- gimp_composite_blend (in, layer, mask, out, opacity, samples, blend_trc,
- composite_trc, composite_mode, blendfun_lch_chroma);
+ gimp_composite_blend (in, layer, mask, out, opacity, samples,
+ blend_trc, composite_trc, composite_mode,
+ blendfun_lch_chroma);
return TRUE;
}
diff --git a/app/operations/layer-modes/gimpoperationlchchroma.h
b/app/operations/layer-modes/gimpoperationlchchroma.h
index f3d8e35..ce51d06 100644
--- a/app/operations/layer-modes/gimpoperationlchchroma.h
+++ b/app/operations/layer-modes/gimpoperationlchchroma.h
@@ -59,7 +59,7 @@ gboolean gimp_operation_lch_chroma_process_pixels_linear (gfloat *i
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
+ GimpLayerBlendTRC blend_trc,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode);
@@ -71,7 +71,7 @@ gboolean gimp_operation_lch_chroma_process_pixels (gfloat
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
+ GimpLayerBlendTRC blend_trc,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes/gimpoperationlchcolor.c
b/app/operations/layer-modes/gimpoperationlchcolor.c
index 4efc26e..469f600 100644
--- a/app/operations/layer-modes/gimpoperationlchcolor.c
+++ b/app/operations/layer-modes/gimpoperationlchcolor.c
@@ -22,8 +22,11 @@
*/
#include "config.h"
+
#include <gegl-plugin.h>
+
#include "../operations-types.h"
+
#include "gimpoperationlchcolor.h"
#include "gimpblendcomposite.h"
@@ -82,7 +85,13 @@ gimp_operation_lch_color_process (GeglOperation *operation,
return (gimp_op->linear ? gimp_operation_lch_color_process_pixels_linear :
gimp_operation_lch_color_process_pixels)
- (in_buf, aux_buf, aux2_buf, out_buf, gimp_op->opacity, samples, roi, level, gimp_op->blend_trc,
gimp_op->composite_trc, gimp_op->composite_mode);
+ (in_buf, aux_buf, aux2_buf,
+ out_buf,
+ gimp_op->opacity,
+ samples, roi, level,
+ gimp_op->blend_trc,
+ gimp_op->composite_trc,
+ gimp_op->composite_mode);
}
static void
@@ -128,7 +137,7 @@ gimp_operation_lch_color_process_pixels (gfloat *in,
static const Babl *from_fish_laba = NULL;
static const Babl *from_fish_la = NULL;
static const Babl *to_fish = NULL;
-
+
if (!from_fish_laba)
from_fish_laba = babl_fish ("R'G'B'A float", "CIE Lab alpha float");
if (!from_fish_la)
@@ -157,6 +166,7 @@ gimp_operation_lch_color_process_pixels_linear (gfloat *in,
GimpLayerCompositeMode composite_mode)
{
gimp_composite_blend (in, layer, mask, out, opacity, samples,
- blend_trc, composite_trc, composite_mode, blendfun_lch_color);
+ blend_trc, composite_trc, composite_mode,
+ blendfun_lch_color);
return TRUE;
}
diff --git a/app/operations/layer-modes/gimpoperationlchcolor.h
b/app/operations/layer-modes/gimpoperationlchcolor.h
index c810579..087dfba 100644
--- a/app/operations/layer-modes/gimpoperationlchcolor.h
+++ b/app/operations/layer-modes/gimpoperationlchcolor.h
@@ -59,7 +59,7 @@ gboolean gimp_operation_lch_color_process_pixels_linear (gfloat *
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
+ GimpLayerBlendTRC blend_trc,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode);
@@ -71,7 +71,7 @@ gboolean gimp_operation_lch_color_process_pixels (gfloat *
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
+ GimpLayerBlendTRC blend_trc,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes/gimpoperationlchhue.c
b/app/operations/layer-modes/gimpoperationlchhue.c
index 0e89002..77e7abd 100644
--- a/app/operations/layer-modes/gimpoperationlchhue.c
+++ b/app/operations/layer-modes/gimpoperationlchhue.c
@@ -22,9 +22,11 @@
*/
#include "config.h"
+
#include <gegl-plugin.h>
-#include <math.h>
+
#include "../operations-types.h"
+
#include "gimpoperationlchhue.h"
#include "gimpblendcomposite.h"
@@ -83,7 +85,13 @@ gimp_operation_lch_hue_process (GeglOperation *operation,
return (layer_mode->linear ? gimp_operation_lch_hue_process_pixels_linear :
gimp_operation_lch_hue_process_pixels)
- (in_buf, aux_buf, aux2_buf, out_buf, layer_mode->opacity, samples, roi, level, layer_mode->blend_trc,
layer_mode->composite_trc, layer_mode->composite_mode);
+ (in_buf, aux_buf, aux2_buf,
+ out_buf,
+ layer_mode->opacity,
+ samples, roi, level,
+ layer_mode->blend_trc,
+ layer_mode->composite_trc,
+ layer_mode->composite_mode);
}
static void
@@ -138,7 +146,7 @@ gimp_operation_lch_hue_process_pixels (gfloat *in,
{
static const Babl *from_fish = NULL;
static const Babl *to_fish = NULL;
-
+
if (!from_fish)
from_fish = babl_fish ("R'G'B'A float", "CIE Lab alpha float");
if (!to_fish)
@@ -164,7 +172,8 @@ gimp_operation_lch_hue_process_pixels_linear (gfloat *in,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode)
{
- gimp_composite_blend (in, layer, mask, out, opacity, samples, blend_trc,
- composite_trc, composite_mode, blendfun_lch_hue);
+ gimp_composite_blend (in, layer, mask, out, opacity, samples,
+ blend_trc, composite_trc, composite_mode,
+ blendfun_lch_hue);
return TRUE;
}
diff --git a/app/operations/layer-modes/gimpoperationlchhue.h
b/app/operations/layer-modes/gimpoperationlchhue.h
index 19e582c..316da32 100644
--- a/app/operations/layer-modes/gimpoperationlchhue.h
+++ b/app/operations/layer-modes/gimpoperationlchhue.h
@@ -59,7 +59,7 @@ gboolean gimp_operation_lch_hue_process_pixels_linear (gfloat *in
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
+ GimpLayerBlendTRC blend_trc,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode);
@@ -71,7 +71,7 @@ gboolean gimp_operation_lch_hue_process_pixels (gfloat *in
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
+ GimpLayerBlendTRC blend_trc,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes/gimpoperationlchlightness.c
b/app/operations/layer-modes/gimpoperationlchlightness.c
index abcf698..f146fee 100644
--- a/app/operations/layer-modes/gimpoperationlchlightness.c
+++ b/app/operations/layer-modes/gimpoperationlchlightness.c
@@ -21,9 +21,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
- #include "config.h"
+#include "config.h"
#include <gegl-plugin.h>
+
#include "../operations-types.h"
#include "gimpoperationlchlightness.h"
@@ -39,6 +40,7 @@ static gboolean gimp_operation_lch_lightness_process (GeglOperation *opera
const GeglRectangle *roi,
gint level);
+
G_DEFINE_TYPE (GimpOperationLchLightness, gimp_operation_lch_lightness,
GIMP_TYPE_OPERATION_POINT_LAYER_MODE)
@@ -81,7 +83,13 @@ gimp_operation_lch_lightness_process (GeglOperation *operation,
{
GimpOperationPointLayerMode *layer_mode = (GimpOperationPointLayerMode*)operation;
return (layer_mode->linear ? gimp_operation_lch_lightness_process_pixels_linear :
gimp_operation_lch_lightness_process_pixels)
- (in_buf, aux_buf, aux2_buf, out_buf, layer_mode->opacity, samples, roi, level, layer_mode->blend_trc,
layer_mode->composite_trc, layer_mode->composite_mode);
+ (in_buf, aux_buf, aux2_buf,
+ out_buf,
+ layer_mode->opacity,
+ samples, roi, level,
+ layer_mode->blend_trc,
+ layer_mode->composite_trc,
+ layer_mode->composite_mode);
}
static void
@@ -122,7 +130,7 @@ gimp_operation_lch_lightness_process_pixels (gfloat *in,
static const Babl *from_fish_laba = NULL;
static const Babl *from_fish_la = NULL;
static const Babl *to_fish = NULL;
-
+
if (!from_fish_laba)
from_fish_laba = babl_fish ("R'G'B'A float", "CIE Lab alpha float");
if (!from_fish_la)
@@ -152,6 +160,7 @@ gimp_operation_lch_lightness_process_pixels_linear (gfloat *in,
GimpLayerCompositeMode composite_mode)
{
gimp_composite_blend (in, layer, mask, out, opacity, samples,
- blend_trc, composite_trc, composite_mode, blendfun_lch_lightness);
+ blend_trc, composite_trc, composite_mode,
+ blendfun_lch_lightness);
return TRUE;
}
diff --git a/app/operations/layer-modes/gimpoperationlchlightness.h
b/app/operations/layer-modes/gimpoperationlchlightness.h
index 7191253..d71aeec 100644
--- a/app/operations/layer-modes/gimpoperationlchlightness.h
+++ b/app/operations/layer-modes/gimpoperationlchlightness.h
@@ -59,7 +59,7 @@ gboolean gimp_operation_lch_lightness_process_pixels_linear (gfloat
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
+ GimpLayerBlendTRC blend_trc,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode);
@@ -71,7 +71,7 @@ gboolean gimp_operation_lch_lightness_process_pixels (gfloat
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
+ GimpLayerBlendTRC blend_trc,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes/gimpoperationlightenonly.c
b/app/operations/layer-modes/gimpoperationlightenonly.c
index b2c09f1..848f3f8 100644
--- a/app/operations/layer-modes/gimpoperationlightenonly.c
+++ b/app/operations/layer-modes/gimpoperationlightenonly.c
@@ -78,7 +78,13 @@ gimp_operation_lighten_only_process (GeglOperation *operation,
{
GimpOperationPointLayerMode *layer_mode = (GimpOperationPointLayerMode*)operation;
- return gimp_operation_lighten_only_process_pixels (in_buf, aux_buf, aux2_buf, out_buf,
layer_mode->opacity, samples, roi, level, layer_mode->blend_trc, layer_mode->composite_trc,
layer_mode->composite_mode);
+ return gimp_operation_lighten_only_process_pixels (in_buf, aux_buf, aux2_buf,
+ out_buf,
+ layer_mode->opacity,
+ samples, roi, level,
+ layer_mode->blend_trc,
+ layer_mode->composite_trc,
+ layer_mode->composite_mode);
}
gboolean
@@ -95,6 +101,7 @@ gimp_operation_lighten_only_process_pixels (gfloat *in,
GimpLayerCompositeMode composite_mode)
{
gimp_composite_blend (in, layer, mask, out, opacity, samples,
- blend_trc, composite_trc, composite_mode, blendfun_lighten_only);
+ blend_trc, composite_trc, composite_mode,
+ blendfun_lighten_only);
return TRUE;
}
diff --git a/app/operations/layer-modes/gimpoperationlightenonly.h
b/app/operations/layer-modes/gimpoperationlightenonly.h
index cda7443..dea5214 100644
--- a/app/operations/layer-modes/gimpoperationlightenonly.h
+++ b/app/operations/layer-modes/gimpoperationlightenonly.h
@@ -58,7 +58,7 @@ gboolean gimp_operation_lighten_only_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
+ GimpLayerBlendTRC blend_trc,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes/gimpoperationmultiply.c
b/app/operations/layer-modes/gimpoperationmultiply.c
index 2ae56e1..c4c21ad 100644
--- a/app/operations/layer-modes/gimpoperationmultiply.c
+++ b/app/operations/layer-modes/gimpoperationmultiply.c
@@ -78,7 +78,13 @@ gimp_operation_multiply_process (GeglOperation *operation,
{
GimpOperationPointLayerMode *layer_mode = (GimpOperationPointLayerMode*)operation;
- return gimp_operation_multiply_process_pixels (in_buf, aux_buf, aux2_buf, out_buf, layer_mode->opacity,
samples, roi, level, layer_mode->blend_trc, layer_mode->composite_trc, layer_mode->composite_mode);
+ return gimp_operation_multiply_process_pixels (in_buf, aux_buf, aux2_buf,
+ out_buf,
+ layer_mode->opacity,
+ samples, roi, level,
+ layer_mode->blend_trc,
+ layer_mode->composite_trc,
+ layer_mode->composite_mode);
}
gboolean
@@ -95,6 +101,7 @@ gimp_operation_multiply_process_pixels (gfloat *in,
GimpLayerCompositeMode composite_mode)
{
gimp_composite_blend (in, layer, mask, out, opacity, samples,
- blend_trc, composite_trc, composite_mode, blendfun_multiply);
+ blend_trc, composite_trc, composite_mode,
+ blendfun_multiply);
return TRUE;
}
diff --git a/app/operations/layer-modes/gimpoperationmultiply.h
b/app/operations/layer-modes/gimpoperationmultiply.h
index e6fbbf7..9820b15 100644
--- a/app/operations/layer-modes/gimpoperationmultiply.h
+++ b/app/operations/layer-modes/gimpoperationmultiply.h
@@ -58,7 +58,7 @@ gboolean gimp_operation_multiply_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
+ GimpLayerBlendTRC blend_trc,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes/gimpoperationnormal.c
b/app/operations/layer-modes/gimpoperationnormal.c
index da9f5d4..9841ba1 100644
--- a/app/operations/layer-modes/gimpoperationnormal.c
+++ b/app/operations/layer-modes/gimpoperationnormal.c
@@ -174,7 +174,14 @@ gimp_operation_normal_process (GeglOperation *operation,
gint level)
{
GimpOperationPointLayerMode *layer_mode = (GimpOperationPointLayerMode*)operation;
- return gimp_operation_normal_process_pixels (in_buf, aux_buf, aux2_buf, out_buf, layer_mode->opacity,
samples, roi, level, layer_mode->blend_trc, layer_mode->composite_trc, layer_mode->composite_mode);
+
+ return gimp_operation_normal_process_pixels (in_buf, aux_buf, aux2_buf,
+ out_buf,
+ layer_mode->opacity,
+ samples, roi, level,
+ layer_mode->blend_trc,
+ layer_mode->composite_trc,
+ layer_mode->composite_mode);
}
gboolean
diff --git a/app/operations/layer-modes/gimpoperationnormal.h
b/app/operations/layer-modes/gimpoperationnormal.h
index 5a96e15..6d96122 100644
--- a/app/operations/layer-modes/gimpoperationnormal.h
+++ b/app/operations/layer-modes/gimpoperationnormal.h
@@ -59,7 +59,7 @@ gboolean gimp_operation_normal_process_pixels_core (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
+ GimpLayerBlendTRC blend_trc,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode);
@@ -71,7 +71,7 @@ gboolean gimp_operation_normal_process_pixels_sse2 (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
+ GimpLayerBlendTRC blend_trc,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode);
@@ -83,7 +83,7 @@ gboolean gimp_operation_normal_process_pixels_sse4 (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
+ GimpLayerBlendTRC blend_trc,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes/gimpoperationoverlay.c
b/app/operations/layer-modes/gimpoperationoverlay.c
index b3d551c..b214269 100644
--- a/app/operations/layer-modes/gimpoperationoverlay.c
+++ b/app/operations/layer-modes/gimpoperationoverlay.c
@@ -77,7 +77,13 @@ gimp_operation_overlay_process (GeglOperation *operation,
{
GimpOperationPointLayerMode *layer_mode = (GimpOperationPointLayerMode*)operation;
- return gimp_operation_overlay_process_pixels (in_buf, aux_buf, aux2_buf, out_buf, layer_mode->opacity,
samples, roi, level, layer_mode->blend_trc, layer_mode->composite_trc, layer_mode->composite_mode);
+ return gimp_operation_overlay_process_pixels (in_buf, aux_buf, aux2_buf,
+ out_buf,
+ layer_mode->opacity,
+ samples, roi, level,
+ layer_mode->blend_trc,
+ layer_mode->composite_trc,
+ layer_mode->composite_mode);
}
gboolean
@@ -93,8 +99,8 @@ gimp_operation_overlay_process_pixels (gfloat *in,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode)
{
- gimp_composite_blend (in, layer, mask, out, opacity, samples, blend_trc,
- composite_trc, composite_mode, blendfun_overlay);
+ gimp_composite_blend (in, layer, mask, out, opacity, samples,
+ blend_trc, composite_trc, composite_mode,
+ blendfun_overlay);
return TRUE;
}
-
diff --git a/app/operations/layer-modes/gimpoperationoverlay.h
b/app/operations/layer-modes/gimpoperationoverlay.h
index 57001b8..9fd35aa 100644
--- a/app/operations/layer-modes/gimpoperationoverlay.h
+++ b/app/operations/layer-modes/gimpoperationoverlay.h
@@ -57,7 +57,7 @@ gboolean gimp_operation_overlay_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
+ GimpLayerBlendTRC blend_trc,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes/gimpoperationpointlayermode.c
b/app/operations/layer-modes/gimpoperationpointlayermode.c
index 8e47edf..9d58cdf 100644
--- a/app/operations/layer-modes/gimpoperationpointlayermode.c
+++ b/app/operations/layer-modes/gimpoperationpointlayermode.c
@@ -73,6 +73,7 @@ const Babl *_gimp_fish_rgba_to_laba = NULL;
const Babl *_gimp_fish_laba_to_rgba = NULL;
const Babl *_gimp_fish_laba_to_perceptual = NULL;
+
static void
gimp_operation_point_layer_mode_class_init (GimpOperationPointLayerModeClass *klass)
{
diff --git a/app/operations/layer-modes/gimpoperationpointlayermode.h
b/app/operations/layer-modes/gimpoperationpointlayermode.h
index 93cc9ab..d3e5eaa 100644
--- a/app/operations/layer-modes/gimpoperationpointlayermode.h
+++ b/app/operations/layer-modes/gimpoperationpointlayermode.h
@@ -23,13 +23,7 @@
#include <gegl-plugin.h>
-#include <math.h>
-#include <alloca.h>
-#include <cairo.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include "../operations-enums.h"
-#include "../operations-types.h"
-#include "libgimpcolor/gimpcolor.h"
+
#define GIMP_TYPE_OPERATION_POINT_LAYER_MODE (gimp_operation_point_layer_mode_get_type ())
#define GIMP_OPERATION_POINT_LAYER_MODE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),
GIMP_TYPE_OPERATION_POINT_LAYER_MODE, GimpOperationPointLayerMode))
@@ -57,9 +51,8 @@ struct _GimpOperationPointLayerMode
GimpLayerCompositeMode composite_mode;
};
-GType gimp_operation_point_layer_mode_get_type (void) G_GNUC_CONST;
-#include "gimpoperationnormal.h"
+GType gimp_operation_point_layer_mode_get_type (void) G_GNUC_CONST;
#endif /* __GIMP_OPERATION_POINT_LAYER_MODE_H__ */
diff --git a/app/operations/layer-modes/gimpoperationreplace.c
b/app/operations/layer-modes/gimpoperationreplace.c
index 12450ce..f2c0a83 100644
--- a/app/operations/layer-modes/gimpoperationreplace.c
+++ b/app/operations/layer-modes/gimpoperationreplace.c
@@ -75,7 +75,13 @@ gimp_operation_replace_process (GeglOperation *operation,
{
GimpOperationPointLayerMode *layer_mode = (GimpOperationPointLayerMode*)operation;
- return gimp_operation_replace_process_pixels (in_buf, aux_buf, aux2_buf, out_buf, layer_mode->opacity,
samples, roi, level, layer_mode->blend_trc, layer_mode->composite_trc, layer_mode->composite_mode);
+ return gimp_operation_replace_process_pixels (in_buf, aux_buf, aux2_buf,
+ out_buf,
+ layer_mode->opacity,
+ samples, roi, level,
+ layer_mode->blend_trc,
+ layer_mode->composite_trc,
+ layer_mode->composite_mode);
}
gboolean
diff --git a/app/operations/layer-modes/gimpoperationreplace.h
b/app/operations/layer-modes/gimpoperationreplace.h
index ad34751..3804097 100644
--- a/app/operations/layer-modes/gimpoperationreplace.h
+++ b/app/operations/layer-modes/gimpoperationreplace.h
@@ -57,7 +57,7 @@ gboolean gimp_operation_replace_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
+ GimpLayerBlendTRC blend_trc,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes/gimpoperationscreen.c
b/app/operations/layer-modes/gimpoperationscreen.c
index 76ac125..6d8eac1 100644
--- a/app/operations/layer-modes/gimpoperationscreen.c
+++ b/app/operations/layer-modes/gimpoperationscreen.c
@@ -66,7 +66,6 @@ gimp_operation_screen_init (GimpOperationScreen *self)
{
}
-
static gboolean
gimp_operation_screen_process (GeglOperation *operation,
void *in_buf,
@@ -78,7 +77,13 @@ gimp_operation_screen_process (GeglOperation *operation,
gint level)
{
GimpOperationPointLayerMode *layer_mode = (GimpOperationPointLayerMode*)operation;
- return gimp_operation_screen_process_pixels (in_buf, aux_buf, aux2_buf, out_buf, layer_mode->opacity,
samples, roi, level, layer_mode->blend_trc, layer_mode->composite_trc, layer_mode->composite_mode);
+ return gimp_operation_screen_process_pixels (in_buf, aux_buf, aux2_buf,
+ out_buf,
+ layer_mode->opacity,
+ samples, roi, level,
+ layer_mode->blend_trc,
+ layer_mode->composite_trc,
+ layer_mode->composite_mode);
}
gboolean
@@ -95,7 +100,7 @@ gimp_operation_screen_process_pixels (gfloat *in,
GimpLayerCompositeMode composite_mode)
{
gimp_composite_blend (in, layer, mask, out, opacity, samples,
- blend_trc, composite_trc, composite_mode, blendfun_screen);
+ blend_trc, composite_trc, composite_mode,
+ blendfun_screen);
return TRUE;
}
-
diff --git a/app/operations/layer-modes/gimpoperationscreen.h
b/app/operations/layer-modes/gimpoperationscreen.h
index 2de2110..ab983b5 100644
--- a/app/operations/layer-modes/gimpoperationscreen.h
+++ b/app/operations/layer-modes/gimpoperationscreen.h
@@ -57,7 +57,7 @@ gboolean gimp_operation_screen_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
+ GimpLayerBlendTRC blend_trc,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes/gimpoperationsoftlight.c
b/app/operations/layer-modes/gimpoperationsoftlight.c
index 9d7f06f..3059910 100644
--- a/app/operations/layer-modes/gimpoperationsoftlight.c
+++ b/app/operations/layer-modes/gimpoperationsoftlight.c
@@ -94,7 +94,13 @@ gimp_operation_softlight_process (GeglOperation *operation,
gint level)
{
GimpOperationPointLayerMode *layer_mode = (GimpOperationPointLayerMode*)operation;
- return gimp_operation_softlight_process_pixels (in_buf, aux_buf, aux2_buf, out_buf, layer_mode->opacity,
samples, roi, level, layer_mode->blend_trc, layer_mode->composite_trc, layer_mode->composite_mode);
+ return gimp_operation_softlight_process_pixels (in_buf, aux_buf, aux2_buf,
+ out_buf,
+ layer_mode->opacity,
+ samples, roi, level,
+ layer_mode->blend_trc,
+ layer_mode->composite_trc,
+ layer_mode->composite_mode);
}
gboolean
@@ -111,6 +117,7 @@ gimp_operation_softlight_process_pixels (gfloat *in,
GimpLayerCompositeMode composite_mode)
{
gimp_composite_blend (in, layer, mask, out, opacity, samples,
- blend_trc, composite_trc, composite_mode, blendfun_softlight);
+ blend_trc, composite_trc, composite_mode,
+ blendfun_softlight);
return TRUE;
}
diff --git a/app/operations/layer-modes/gimpoperationsoftlight.h
b/app/operations/layer-modes/gimpoperationsoftlight.h
index cb0e085..9977a9e 100644
--- a/app/operations/layer-modes/gimpoperationsoftlight.h
+++ b/app/operations/layer-modes/gimpoperationsoftlight.h
@@ -57,7 +57,7 @@ gboolean gimp_operation_softlight_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
+ GimpLayerBlendTRC blend_trc,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode);
diff --git a/app/operations/layer-modes/gimpoperationsubtract.c
b/app/operations/layer-modes/gimpoperationsubtract.c
index b2b696d..84f53d0 100644
--- a/app/operations/layer-modes/gimpoperationsubtract.c
+++ b/app/operations/layer-modes/gimpoperationsubtract.c
@@ -29,6 +29,7 @@
#include "gimpoperationsubtract.h"
#include "gimpblendcomposite.h"
+
static gboolean gimp_operation_subtract_process (GeglOperation *operation,
void *in_buf,
void *aux_buf,
@@ -77,7 +78,13 @@ gimp_operation_subtract_process (GeglOperation *operation,
{
GimpOperationPointLayerMode *layer_mode = (GimpOperationPointLayerMode*)operation;
- return gimp_operation_subtract_process_pixels (in_buf, aux_buf, aux2_buf, out_buf, layer_mode->opacity,
samples, roi, level, layer_mode->blend_trc, layer_mode->composite_trc, layer_mode->composite_mode);
+ return gimp_operation_subtract_process_pixels (in_buf, aux_buf, aux2_buf,
+ out_buf,
+ layer_mode->opacity,
+ samples, roi, level,
+ layer_mode->blend_trc,
+ layer_mode->composite_trc,
+ layer_mode->composite_mode);
}
gboolean
@@ -93,7 +100,8 @@ gimp_operation_subtract_process_pixels (gfloat *in,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode)
{
- gimp_composite_blend (in, layer, mask, out, opacity, samples, blend_trc,
- composite_trc, composite_mode, blendfun_subtract);
+ gimp_composite_blend (in, layer, mask, out, opacity, samples,
+ blend_trc, composite_trc, composite_mode,
+ blendfun_subtract);
return TRUE;
}
diff --git a/app/operations/layer-modes/gimpoperationsubtract.h
b/app/operations/layer-modes/gimpoperationsubtract.h
index bb9c49b..d530c70 100644
--- a/app/operations/layer-modes/gimpoperationsubtract.h
+++ b/app/operations/layer-modes/gimpoperationsubtract.h
@@ -58,7 +58,7 @@ gboolean gimp_operation_subtract_process_pixels (gfloat *in,
glong samples,
const GeglRectangle *roi,
gint level,
- GimpLayerBlendTRC blend_trc,
+ GimpLayerBlendTRC blend_trc,
GimpLayerBlendTRC composite_trc,
GimpLayerCompositeMode composite_mode);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
