app: coding style cleanup in all layer modes, fiddle with includes a bit

This commit is contained in:
Michael Natterer 2017-01-19 17:48:45 +01:00
parent 80c947f04f
commit d656fbab86
97 changed files with 483 additions and 183 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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