From 011b0589457406cabcb619524bb6df04b3faf1b8 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Mon, 26 Mar 2012 01:13:37 +0200 Subject: [PATCH] app: follow GEGL API changes --- app/gegl/gimpoperationadditionmode.c | 6 ++++-- app/gegl/gimpoperationantierasemode.c | 6 ++++-- app/gegl/gimpoperationbehindmode.c | 6 ++++-- app/gegl/gimpoperationbrightnesscontrast.c | 6 ++++-- app/gegl/gimpoperationburnmode.c | 6 ++++-- app/gegl/gimpoperationcagecoefcalc.c | 10 ++++++---- app/gegl/gimpoperationcagetransform.c | 11 +++++++---- app/gegl/gimpoperationcolorbalance.c | 6 ++++-- app/gegl/gimpoperationcolorerasemode.c | 6 ++++-- app/gegl/gimpoperationcolorize.c | 6 ++++-- app/gegl/gimpoperationcolormode.c | 6 ++++-- app/gegl/gimpoperationcurves.c | 6 ++++-- app/gegl/gimpoperationdarkenonlymode.c | 6 ++++-- app/gegl/gimpoperationdesaturate.c | 6 ++++-- app/gegl/gimpoperationdifferencemode.c | 6 ++++-- app/gegl/gimpoperationdissolvemode.c | 6 ++++-- app/gegl/gimpoperationdividemode.c | 6 ++++-- app/gegl/gimpoperationdodgemode.c | 6 ++++-- app/gegl/gimpoperationerasemode.c | 6 ++++-- app/gegl/gimpoperationgrainextractmode.c | 6 ++++-- app/gegl/gimpoperationgrainmergemode.c | 6 ++++-- app/gegl/gimpoperationhardlightmode.c | 6 ++++-- app/gegl/gimpoperationhuemode.c | 6 ++++-- app/gegl/gimpoperationhuesaturation.c | 6 ++++-- app/gegl/gimpoperationlevels.c | 6 ++++-- app/gegl/gimpoperationlightenonlymode.c | 6 ++++-- app/gegl/gimpoperationmultiplymode.c | 6 ++++-- app/gegl/gimpoperationoverlaymode.c | 6 ++++-- app/gegl/gimpoperationpointlayermode.c | 6 ++++-- app/gegl/gimpoperationposterize.c | 6 ++++-- app/gegl/gimpoperationreplacemode.c | 6 ++++-- app/gegl/gimpoperationsaturationmode.c | 6 ++++-- app/gegl/gimpoperationscreenmode.c | 6 ++++-- app/gegl/gimpoperationsoftlightmode.c | 6 ++++-- app/gegl/gimpoperationsubtractmode.c | 6 ++++-- app/gegl/gimpoperationthreshold.c | 6 ++++-- app/gegl/gimpoperationtilesink.c | 10 ++++++---- app/gegl/gimpoperationtilesource.c | 8 +++++--- app/gegl/gimpoperationvaluemode.c | 6 ++++-- 39 files changed, 164 insertions(+), 85 deletions(-) diff --git a/app/gegl/gimpoperationadditionmode.c b/app/gegl/gimpoperationadditionmode.c index 645d5e8a24..a3ded89b9e 100644 --- a/app/gegl/gimpoperationadditionmode.c +++ b/app/gegl/gimpoperationadditionmode.c @@ -33,7 +33,8 @@ static gboolean gimp_operation_addition_mode_process (GeglOperation *opera void *aux_buf, void *out_buf, glong samples, - const GeglRectangle *roi); + const GeglRectangle *roi, + gint level); G_DEFINE_TYPE (GimpOperationAdditionMode, gimp_operation_addition_mode, @@ -66,7 +67,8 @@ gimp_operation_addition_mode_process (GeglOperation *operation, void *aux_buf, void *out_buf, glong samples, - const GeglRectangle *roi) + const GeglRectangle *roi, + gint level) { gfloat *in = in_buf; gfloat *layer = aux_buf; diff --git a/app/gegl/gimpoperationantierasemode.c b/app/gegl/gimpoperationantierasemode.c index 132d861b5a..8c51e33cae 100644 --- a/app/gegl/gimpoperationantierasemode.c +++ b/app/gegl/gimpoperationantierasemode.c @@ -33,7 +33,8 @@ static gboolean gimp_operation_anti_erase_mode_process (GeglOperation *ope void *aux_buf, void *out_buf, glong samples, - const GeglRectangle *roi); + const GeglRectangle *roi, + gint level); G_DEFINE_TYPE (GimpOperationAntiEraseMode, gimp_operation_anti_erase_mode, @@ -66,7 +67,8 @@ gimp_operation_anti_erase_mode_process (GeglOperation *operation, void *aux_buf, void *out_buf, glong samples, - const GeglRectangle *roi) + const GeglRectangle *roi, + gint level) { gfloat *in = in_buf; gfloat *layer = aux_buf; diff --git a/app/gegl/gimpoperationbehindmode.c b/app/gegl/gimpoperationbehindmode.c index cf97a070b6..e028d99567 100644 --- a/app/gegl/gimpoperationbehindmode.c +++ b/app/gegl/gimpoperationbehindmode.c @@ -33,7 +33,8 @@ static gboolean gimp_operation_behind_mode_process (GeglOperation *operati void *aux_buf, void *out_buf, glong samples, - const GeglRectangle *roi); + const GeglRectangle *roi, + gint level); G_DEFINE_TYPE (GimpOperationBehindMode, gimp_operation_behind_mode, @@ -66,7 +67,8 @@ gimp_operation_behind_mode_process (GeglOperation *operation, void *aux_buf, void *out_buf, glong samples, - const GeglRectangle *roi) + const GeglRectangle *roi, + gint level) { gfloat *in = in_buf; gfloat *layer = aux_buf; diff --git a/app/gegl/gimpoperationbrightnesscontrast.c b/app/gegl/gimpoperationbrightnesscontrast.c index 723ae6b567..2cde690bec 100644 --- a/app/gegl/gimpoperationbrightnesscontrast.c +++ b/app/gegl/gimpoperationbrightnesscontrast.c @@ -36,7 +36,8 @@ static gboolean gimp_operation_brightness_contrast_process (GeglOperation void *in_buf, void *out_buf, glong samples, - const GeglRectangle *roi); + const GeglRectangle *roi, + gint level); G_DEFINE_TYPE (GimpOperationBrightnessContrast, gimp_operation_brightness_contrast, @@ -100,7 +101,8 @@ gimp_operation_brightness_contrast_process (GeglOperation *operation, void *in_buf, void *out_buf, glong samples, - const GeglRectangle *roi) + const GeglRectangle *roi, + gint level) { GimpOperationPointFilter *point = GIMP_OPERATION_POINT_FILTER (operation); GimpBrightnessContrastConfig *config = GIMP_BRIGHTNESS_CONTRAST_CONFIG (point->config); diff --git a/app/gegl/gimpoperationburnmode.c b/app/gegl/gimpoperationburnmode.c index 6325ab43dc..f585b8d7a0 100644 --- a/app/gegl/gimpoperationburnmode.c +++ b/app/gegl/gimpoperationburnmode.c @@ -33,7 +33,8 @@ static gboolean gimp_operation_burn_mode_process (GeglOperation *operation void *aux_buf, void *out_buf, glong samples, - const GeglRectangle *roi); + const GeglRectangle *roi, + gint level); G_DEFINE_TYPE (GimpOperationBurnMode, gimp_operation_burn_mode, @@ -66,7 +67,8 @@ gimp_operation_burn_mode_process (GeglOperation *operation, void *aux_buf, void *out_buf, glong samples, - const GeglRectangle *roi) + const GeglRectangle *roi, + gint level) { gfloat *in = in_buf; gfloat *layer = aux_buf; diff --git a/app/gegl/gimpoperationcagecoefcalc.c b/app/gegl/gimpoperationcagecoefcalc.c index 30e8c9e8d0..a7705b55fa 100644 --- a/app/gegl/gimpoperationcagecoefcalc.c +++ b/app/gegl/gimpoperationcagecoefcalc.c @@ -44,7 +44,8 @@ static void gimp_operation_cage_coef_calc_set_property (GObject static GeglRectangle gimp_operation_cage_coef_calc_get_bounding_box (GeglOperation *operation); static gboolean gimp_operation_cage_coef_calc_process (GeglOperation *operation, GeglBuffer *output, - const GeglRectangle *roi); + const GeglRectangle *roi, + gint level); G_DEFINE_TYPE (GimpOperationCageCoefCalc, gimp_operation_cage_coef_calc, @@ -191,12 +192,13 @@ gimp_operation_cage_coef_calc_get_bounding_box (GeglOperation *operation) static gboolean gimp_operation_cage_coef_calc_process (GeglOperation *operation, GeglBuffer *output, - const GeglRectangle *roi) + const GeglRectangle *roi, + gint level) { GimpOperationCageCoefCalc *occc = GIMP_OPERATION_CAGE_COEF_CALC (operation); GimpCageConfig *config = GIMP_CAGE_CONFIG (occc->config); - Babl *format = babl_format_n (babl_type ("float"), 2 * gimp_cage_config_get_n_points (config)); + const Babl *format = babl_format_n (babl_type ("float"), 2 * gimp_cage_config_get_n_points (config)); GeglBufferIterator *it; guint n_cage_vertices; @@ -207,7 +209,7 @@ gimp_operation_cage_coef_calc_process (GeglOperation *operation, n_cage_vertices = gimp_cage_config_get_n_points (config); - it = gegl_buffer_iterator_new (output, roi, format, GEGL_BUFFER_READWRITE); + it = gegl_buffer_iterator_new (output, roi, format, GEGL_BUFFER_READWRITE, 0); while (gegl_buffer_iterator_next (it)) { diff --git a/app/gegl/gimpoperationcagetransform.c b/app/gegl/gimpoperationcagetransform.c index e43b71fef8..9658e68670 100644 --- a/app/gegl/gimpoperationcagetransform.c +++ b/app/gegl/gimpoperationcagetransform.c @@ -56,7 +56,8 @@ static gboolean gimp_operation_cage_transform_process (GeglO GeglBuffer *in_buf, GeglBuffer *aux_buf, GeglBuffer *out_buf, - const GeglRectangle *roi); + const GeglRectangle *roi, + gint level); static void gimp_operation_cage_transform_interpolate_source_coords_recurs (GimpOperationCageTransform *oct, GeglBuffer *out_buf, @@ -224,7 +225,8 @@ gimp_operation_cage_transform_process (GeglOperation *operation, GeglBuffer *in_buf, GeglBuffer *aux_buf, GeglBuffer *out_buf, - const GeglRectangle *roi) + const GeglRectangle *roi, + gint level) { GimpOperationCageTransform *oct = GIMP_OPERATION_CAGE_TRANSFORM (operation); GimpCageConfig *config = GIMP_CAGE_CONFIG (oct->config); @@ -240,7 +242,7 @@ gimp_operation_cage_transform_process (GeglOperation *operation, guint n_cage_vertices; /* pre-fill the out buffer with no-displacement coordinate */ - it = gegl_buffer_iterator_new (out_buf, roi, NULL, GEGL_BUFFER_WRITE); + it = gegl_buffer_iterator_new (out_buf, roi, NULL, GEGL_BUFFER_WRITE, 0); cage_bb = gimp_cage_config_get_bounding_box (config); point = &(g_array_index (config->cage_points, GimpCagePoint, 0)); @@ -460,6 +462,7 @@ gimp_operation_cage_transform_interpolate_source_coords_recurs (GimpOperationCag gegl_buffer_set (out_buf, &rect, + 0, oct->format_coords, coords, GEGL_AUTO_ROWSTRIDE); @@ -561,7 +564,7 @@ gimp_cage_transform_compute_destination (GimpCageConfig *config, rect.x = coords.x; rect.y = coords.y; - gegl_buffer_get (coef_buf, 1, &rect, format_coef, coef, GEGL_AUTO_ROWSTRIDE); + gegl_buffer_get (coef_buf, &rect, 1.0, format_coef, coef, GEGL_AUTO_ROWSTRIDE); #endif for (i = 0; i < n_cage_vertices; i++) diff --git a/app/gegl/gimpoperationcolorbalance.c b/app/gegl/gimpoperationcolorbalance.c index bf880356d4..1f3d4145d3 100644 --- a/app/gegl/gimpoperationcolorbalance.c +++ b/app/gegl/gimpoperationcolorbalance.c @@ -36,7 +36,8 @@ static gboolean gimp_operation_color_balance_process (GeglOperation *opera void *in_buf, void *out_buf, glong samples, - const GeglRectangle *roi); + const GeglRectangle *roi, + gint level); G_DEFINE_TYPE (GimpOperationColorBalance, gimp_operation_color_balance, @@ -116,7 +117,8 @@ gimp_operation_color_balance_process (GeglOperation *operation, void *in_buf, void *out_buf, glong samples, - const GeglRectangle *roi) + const GeglRectangle *roi, + gint level) { GimpOperationPointFilter *point = GIMP_OPERATION_POINT_FILTER (operation); GimpColorBalanceConfig *config = GIMP_COLOR_BALANCE_CONFIG (point->config); diff --git a/app/gegl/gimpoperationcolorerasemode.c b/app/gegl/gimpoperationcolorerasemode.c index f1cf0ab2cd..ddb743bcfd 100644 --- a/app/gegl/gimpoperationcolorerasemode.c +++ b/app/gegl/gimpoperationcolorerasemode.c @@ -33,7 +33,8 @@ static gboolean gimp_operation_color_erase_mode_process (GeglOperation *op void *aux_buf, void *out_buf, glong samples, - const GeglRectangle *roi); + const GeglRectangle *roi, + gint level); G_DEFINE_TYPE (GimpOperationColorEraseMode, gimp_operation_color_erase_mode, @@ -66,7 +67,8 @@ gimp_operation_color_erase_mode_process (GeglOperation *operation, void *aux_buf, void *out_buf, glong samples, - const GeglRectangle *roi) + const GeglRectangle *roi, + gint level) { gfloat *in = in_buf; gfloat *layer = aux_buf; diff --git a/app/gegl/gimpoperationcolorize.c b/app/gegl/gimpoperationcolorize.c index 2753a3bb28..ac732866b5 100644 --- a/app/gegl/gimpoperationcolorize.c +++ b/app/gegl/gimpoperationcolorize.c @@ -35,7 +35,8 @@ static gboolean gimp_operation_colorize_process (GeglOperation *operation, void *in_buf, void *out_buf, glong samples, - const GeglRectangle *roi); + const GeglRectangle *roi, + gint level); G_DEFINE_TYPE (GimpOperationColorize, gimp_operation_colorize, @@ -80,7 +81,8 @@ gimp_operation_colorize_process (GeglOperation *operation, void *in_buf, void *out_buf, glong samples, - const GeglRectangle *roi) + const GeglRectangle *roi, + gint level) { GimpOperationPointFilter *point = GIMP_OPERATION_POINT_FILTER (operation); GimpColorizeConfig *config = GIMP_COLORIZE_CONFIG (point->config); diff --git a/app/gegl/gimpoperationcolormode.c b/app/gegl/gimpoperationcolormode.c index 26e5d0cdca..3f4dc0bd59 100644 --- a/app/gegl/gimpoperationcolormode.c +++ b/app/gegl/gimpoperationcolormode.c @@ -33,7 +33,8 @@ static gboolean gimp_operation_color_mode_process (GeglOperation *operatio void *aux_buf, void *out_buf, glong samples, - const GeglRectangle *roi); + const GeglRectangle *roi, + gint level); G_DEFINE_TYPE (GimpOperationColorMode, gimp_operation_color_mode, @@ -66,7 +67,8 @@ gimp_operation_color_mode_process (GeglOperation *operation, void *aux_buf, void *out_buf, glong samples, - const GeglRectangle *roi) + const GeglRectangle *roi, + gint level) { gfloat *in = in_buf; gfloat *layer = aux_buf; diff --git a/app/gegl/gimpoperationcurves.c b/app/gegl/gimpoperationcurves.c index ed9ae13f1e..07560add02 100644 --- a/app/gegl/gimpoperationcurves.c +++ b/app/gegl/gimpoperationcurves.c @@ -39,7 +39,8 @@ static gboolean gimp_operation_curves_process (GeglOperation *operation, void *in_buf, void *out_buf, glong samples, - const GeglRectangle *roi); + const GeglRectangle *roi, + gint level); G_DEFINE_TYPE (GimpOperationCurves, gimp_operation_curves, @@ -84,7 +85,8 @@ gimp_operation_curves_process (GeglOperation *operation, void *in_buf, void *out_buf, glong samples, - const GeglRectangle *roi) + const GeglRectangle *roi, + gint level) { GimpOperationPointFilter *point = GIMP_OPERATION_POINT_FILTER (operation); GimpCurvesConfig *config = GIMP_CURVES_CONFIG (point->config); diff --git a/app/gegl/gimpoperationdarkenonlymode.c b/app/gegl/gimpoperationdarkenonlymode.c index acd9265850..5aa17c7728 100644 --- a/app/gegl/gimpoperationdarkenonlymode.c +++ b/app/gegl/gimpoperationdarkenonlymode.c @@ -33,7 +33,8 @@ static gboolean gimp_operation_darken_only_mode_process (GeglOperation *op void *aux_buf, void *out_buf, glong samples, - const GeglRectangle *roi); + const GeglRectangle *roi, + gint level); G_DEFINE_TYPE (GimpOperationDarkenOnlyMode, gimp_operation_darken_only_mode, @@ -66,7 +67,8 @@ gimp_operation_darken_only_mode_process (GeglOperation *operation, void *aux_buf, void *out_buf, glong samples, - const GeglRectangle *roi) + const GeglRectangle *roi, + gint level) { gfloat *in = in_buf; gfloat *layer = aux_buf; diff --git a/app/gegl/gimpoperationdesaturate.c b/app/gegl/gimpoperationdesaturate.c index 456021201c..fe33cfc811 100644 --- a/app/gegl/gimpoperationdesaturate.c +++ b/app/gegl/gimpoperationdesaturate.c @@ -35,7 +35,8 @@ static gboolean gimp_operation_desaturate_process (GeglOperation *operati void *in_buf, void *out_buf, glong samples, - const GeglRectangle *roi); + const GeglRectangle *roi, + gint level); G_DEFINE_TYPE (GimpOperationDesaturate, gimp_operation_desaturate, @@ -80,7 +81,8 @@ gimp_operation_desaturate_process (GeglOperation *operation, void *in_buf, void *out_buf, glong samples, - const GeglRectangle *roi) + const GeglRectangle *roi, + gint level) { GimpOperationPointFilter *point = GIMP_OPERATION_POINT_FILTER (operation); GimpDesaturateConfig *config = GIMP_DESATURATE_CONFIG (point->config); diff --git a/app/gegl/gimpoperationdifferencemode.c b/app/gegl/gimpoperationdifferencemode.c index b6c7ff1e28..e4f42c4d11 100644 --- a/app/gegl/gimpoperationdifferencemode.c +++ b/app/gegl/gimpoperationdifferencemode.c @@ -33,7 +33,8 @@ static gboolean gimp_operation_difference_mode_process (GeglOperation *ope void *aux_buf, void *out_buf, glong samples, - const GeglRectangle *roi); + const GeglRectangle *roi, + gint level); G_DEFINE_TYPE (GimpOperationDifferenceMode, gimp_operation_difference_mode, @@ -66,7 +67,8 @@ gimp_operation_difference_mode_process (GeglOperation *operation, void *aux_buf, void *out_buf, glong samples, - const GeglRectangle *roi) + const GeglRectangle *roi, + gint level) { gfloat *in = in_buf; gfloat *layer = aux_buf; diff --git a/app/gegl/gimpoperationdissolvemode.c b/app/gegl/gimpoperationdissolvemode.c index 5cb61bf1ce..1d78d4c068 100644 --- a/app/gegl/gimpoperationdissolvemode.c +++ b/app/gegl/gimpoperationdissolvemode.c @@ -33,7 +33,8 @@ static gboolean gimp_operation_dissolve_mode_process (GeglOperation *opera void *aux_buf, void *out_buf, glong samples, - const GeglRectangle *roi); + const GeglRectangle *roi, + gint level); G_DEFINE_TYPE (GimpOperationDissolveMode, gimp_operation_dissolve_mode, @@ -66,7 +67,8 @@ gimp_operation_dissolve_mode_process (GeglOperation *operation, void *aux_buf, void *out_buf, glong samples, - const GeglRectangle *roi) + const GeglRectangle *roi, + gint level) { gfloat *in = in_buf; gfloat *layer = aux_buf; diff --git a/app/gegl/gimpoperationdividemode.c b/app/gegl/gimpoperationdividemode.c index 0f578f12c7..1c7f0e4777 100644 --- a/app/gegl/gimpoperationdividemode.c +++ b/app/gegl/gimpoperationdividemode.c @@ -33,7 +33,8 @@ static gboolean gimp_operation_divide_mode_process (GeglOperation *operati void *aux_buf, void *out_buf, glong samples, - const GeglRectangle *roi); + const GeglRectangle *roi, + gint level); G_DEFINE_TYPE (GimpOperationDivideMode, gimp_operation_divide_mode, @@ -66,7 +67,8 @@ gimp_operation_divide_mode_process (GeglOperation *operation, void *aux_buf, void *out_buf, glong samples, - const GeglRectangle *roi) + const GeglRectangle *roi, + gint level) { gfloat *in = in_buf; gfloat *layer = aux_buf; diff --git a/app/gegl/gimpoperationdodgemode.c b/app/gegl/gimpoperationdodgemode.c index 92dde2d7b6..b500be00e9 100644 --- a/app/gegl/gimpoperationdodgemode.c +++ b/app/gegl/gimpoperationdodgemode.c @@ -33,7 +33,8 @@ static gboolean gimp_operation_dodge_mode_process (GeglOperation *operatio void *aux_buf, void *out_buf, glong samples, - const GeglRectangle *roi); + const GeglRectangle *roi, + gint level); G_DEFINE_TYPE (GimpOperationDodgeMode, gimp_operation_dodge_mode, @@ -66,7 +67,8 @@ gimp_operation_dodge_mode_process (GeglOperation *operation, void *aux_buf, void *out_buf, glong samples, - const GeglRectangle *roi) + const GeglRectangle *roi, + gint level) { gfloat *in = in_buf; gfloat *layer = aux_buf; diff --git a/app/gegl/gimpoperationerasemode.c b/app/gegl/gimpoperationerasemode.c index 71dff2b256..b2763b81ad 100644 --- a/app/gegl/gimpoperationerasemode.c +++ b/app/gegl/gimpoperationerasemode.c @@ -33,7 +33,8 @@ static gboolean gimp_operation_erase_mode_process (GeglOperation *operatio void *aux_buf, void *out_buf, glong samples, - const GeglRectangle *roi); + const GeglRectangle *roi, + gint level); G_DEFINE_TYPE (GimpOperationEraseMode, gimp_operation_erase_mode, @@ -66,7 +67,8 @@ gimp_operation_erase_mode_process (GeglOperation *operation, void *aux_buf, void *out_buf, glong samples, - const GeglRectangle *roi) + const GeglRectangle *roi, + gint level) { gfloat *in = in_buf; gfloat *layer = aux_buf; diff --git a/app/gegl/gimpoperationgrainextractmode.c b/app/gegl/gimpoperationgrainextractmode.c index e7d2e2304a..f5e3be7e82 100644 --- a/app/gegl/gimpoperationgrainextractmode.c +++ b/app/gegl/gimpoperationgrainextractmode.c @@ -33,7 +33,8 @@ static gboolean gimp_operation_grain_extract_mode_process (GeglOperation * void *aux_buf, void *out_buf, glong samples, - const GeglRectangle *roi); + const GeglRectangle *roi, + gint level); G_DEFINE_TYPE (GimpOperationGrainExtractMode, gimp_operation_grain_extract_mode, @@ -66,7 +67,8 @@ gimp_operation_grain_extract_mode_process (GeglOperation *operation, void *aux_buf, void *out_buf, glong samples, - const GeglRectangle *roi) + const GeglRectangle *roi, + gint level) { gfloat *in = in_buf; gfloat *layer = aux_buf; diff --git a/app/gegl/gimpoperationgrainmergemode.c b/app/gegl/gimpoperationgrainmergemode.c index bef4b4b74f..1fd443eac4 100644 --- a/app/gegl/gimpoperationgrainmergemode.c +++ b/app/gegl/gimpoperationgrainmergemode.c @@ -33,7 +33,8 @@ static gboolean gimp_operation_grain_merge_mode_process (GeglOperation *op void *aux_buf, void *out_buf, glong samples, - const GeglRectangle *roi); + const GeglRectangle *roi, + gint level); G_DEFINE_TYPE (GimpOperationGrainMergeMode, gimp_operation_grain_merge_mode, @@ -66,7 +67,8 @@ gimp_operation_grain_merge_mode_process (GeglOperation *operation, void *aux_buf, void *out_buf, glong samples, - const GeglRectangle *roi) + const GeglRectangle *roi, + gint level) { gfloat *in = in_buf; gfloat *layer = aux_buf; diff --git a/app/gegl/gimpoperationhardlightmode.c b/app/gegl/gimpoperationhardlightmode.c index f02bfb83c9..c1e1b188d8 100644 --- a/app/gegl/gimpoperationhardlightmode.c +++ b/app/gegl/gimpoperationhardlightmode.c @@ -33,7 +33,8 @@ static gboolean gimp_operation_hardlight_mode_process (GeglOperation *oper void *aux_buf, void *out_buf, glong samples, - const GeglRectangle *roi); + const GeglRectangle *roi, + gint level); G_DEFINE_TYPE (GimpOperationHardlightMode, gimp_operation_hardlight_mode, @@ -66,7 +67,8 @@ gimp_operation_hardlight_mode_process (GeglOperation *operation, void *aux_buf, void *out_buf, glong samples, - const GeglRectangle *roi) + const GeglRectangle *roi, + gint level) { gfloat *in = in_buf; gfloat *layer = aux_buf; diff --git a/app/gegl/gimpoperationhuemode.c b/app/gegl/gimpoperationhuemode.c index 8356195324..b70737525e 100644 --- a/app/gegl/gimpoperationhuemode.c +++ b/app/gegl/gimpoperationhuemode.c @@ -33,7 +33,8 @@ static gboolean gimp_operation_hue_mode_process (GeglOperation *operation, void *aux_buf, void *out_buf, glong samples, - const GeglRectangle *roi); + const GeglRectangle *roi, + gint level); G_DEFINE_TYPE (GimpOperationHueMode, gimp_operation_hue_mode, @@ -66,7 +67,8 @@ gimp_operation_hue_mode_process (GeglOperation *operation, void *aux_buf, void *out_buf, glong samples, - const GeglRectangle *roi) + const GeglRectangle *roi, + gint level) { gfloat *in = in_buf; gfloat *layer = aux_buf; diff --git a/app/gegl/gimpoperationhuesaturation.c b/app/gegl/gimpoperationhuesaturation.c index 3f530a862c..a563281ad0 100644 --- a/app/gegl/gimpoperationhuesaturation.c +++ b/app/gegl/gimpoperationhuesaturation.c @@ -36,7 +36,8 @@ static gboolean gimp_operation_hue_saturation_process (GeglOperation *oper void *in_buf, void *out_buf, glong samples, - const GeglRectangle *roi); + const GeglRectangle *roi, + gint level); G_DEFINE_TYPE (GimpOperationHueSaturation, gimp_operation_hue_saturation, @@ -129,7 +130,8 @@ gimp_operation_hue_saturation_process (GeglOperation *operation, void *in_buf, void *out_buf, glong samples, - const GeglRectangle *roi) + const GeglRectangle *roi, + gint level) { GimpOperationPointFilter *point = GIMP_OPERATION_POINT_FILTER (operation); GimpHueSaturationConfig *config = GIMP_HUE_SATURATION_CONFIG (point->config); diff --git a/app/gegl/gimpoperationlevels.c b/app/gegl/gimpoperationlevels.c index 6c5e62f909..efc5954bcf 100644 --- a/app/gegl/gimpoperationlevels.c +++ b/app/gegl/gimpoperationlevels.c @@ -36,7 +36,8 @@ static gboolean gimp_operation_levels_process (GeglOperation *operation, void *in_buf, void *out_buf, glong samples, - const GeglRectangle *roi); + const GeglRectangle *roi, + gint level); G_DEFINE_TYPE (GimpOperationLevels, gimp_operation_levels, @@ -112,7 +113,8 @@ gimp_operation_levels_process (GeglOperation *operation, void *in_buf, void *out_buf, glong samples, - const GeglRectangle *roi) + const GeglRectangle *roi, + gint level) { GimpOperationPointFilter *point = GIMP_OPERATION_POINT_FILTER (operation); GimpLevelsConfig *config = GIMP_LEVELS_CONFIG (point->config); diff --git a/app/gegl/gimpoperationlightenonlymode.c b/app/gegl/gimpoperationlightenonlymode.c index 26a8d0e5a1..9ba8245539 100644 --- a/app/gegl/gimpoperationlightenonlymode.c +++ b/app/gegl/gimpoperationlightenonlymode.c @@ -33,7 +33,8 @@ static gboolean gimp_operation_lighten_only_mode_process (GeglOperation *o void *aux_buf, void *out_buf, glong samples, - const GeglRectangle *roi); + const GeglRectangle *roi, + gint level); G_DEFINE_TYPE (GimpOperationLightenOnlyMode, gimp_operation_lighten_only_mode, @@ -66,7 +67,8 @@ gimp_operation_lighten_only_mode_process (GeglOperation *operation, void *aux_buf, void *out_buf, glong samples, - const GeglRectangle *roi) + const GeglRectangle *roi, + gint level) { gfloat *in = in_buf; gfloat *layer = aux_buf; diff --git a/app/gegl/gimpoperationmultiplymode.c b/app/gegl/gimpoperationmultiplymode.c index b2756c4a6b..cc4d712ea4 100644 --- a/app/gegl/gimpoperationmultiplymode.c +++ b/app/gegl/gimpoperationmultiplymode.c @@ -33,7 +33,8 @@ static gboolean gimp_operation_multiply_mode_process (GeglOperation *opera void *aux_buf, void *out_buf, glong samples, - const GeglRectangle *roi); + const GeglRectangle *roi, + gint level); G_DEFINE_TYPE (GimpOperationMultiplyMode, gimp_operation_multiply_mode, @@ -66,7 +67,8 @@ gimp_operation_multiply_mode_process (GeglOperation *operation, void *aux_buf, void *out_buf, glong samples, - const GeglRectangle *roi) + const GeglRectangle *roi, + gint level) { gfloat *in = in_buf; gfloat *layer = aux_buf; diff --git a/app/gegl/gimpoperationoverlaymode.c b/app/gegl/gimpoperationoverlaymode.c index 6f67213f9a..e90e3dfeb2 100644 --- a/app/gegl/gimpoperationoverlaymode.c +++ b/app/gegl/gimpoperationoverlaymode.c @@ -33,7 +33,8 @@ static gboolean gimp_operation_overlay_mode_process (GeglOperation *operat void *aux_buf, void *out_buf, glong samples, - const GeglRectangle *roi); + const GeglRectangle *roi, + gint level); G_DEFINE_TYPE (GimpOperationOverlayMode, gimp_operation_overlay_mode, @@ -66,7 +67,8 @@ gimp_operation_overlay_mode_process (GeglOperation *operation, void *aux_buf, void *out_buf, glong samples, - const GeglRectangle *roi) + const GeglRectangle *roi, + gint level) { gfloat *in = in_buf; gfloat *layer = aux_buf; diff --git a/app/gegl/gimpoperationpointlayermode.c b/app/gegl/gimpoperationpointlayermode.c index 71fe53195f..24f8dc15da 100644 --- a/app/gegl/gimpoperationpointlayermode.c +++ b/app/gegl/gimpoperationpointlayermode.c @@ -89,7 +89,8 @@ static gboolean gimp_operation_point_layer_mode_process (GeglOperation void *aux_buf, void *out_buf, glong samples, - const GeglRectangle *roi); + const GeglRectangle *roi, + gint level); G_DEFINE_TYPE (GimpOperationPointLayerMode, gimp_operation_point_layer_mode, @@ -269,7 +270,8 @@ gimp_operation_point_layer_mode_process (GeglOperation *operation, void *aux_buf, void *out_buf, glong samples, - const GeglRectangle *roi) + const GeglRectangle *roi, + gint level) { GimpOperationPointLayerMode *self = GIMP_OPERATION_POINT_LAYER_MODE (operation); GimpLayerModeEffects blend_mode = self->blend_mode; diff --git a/app/gegl/gimpoperationposterize.c b/app/gegl/gimpoperationposterize.c index aea0a317f8..0c0062e5df 100644 --- a/app/gegl/gimpoperationposterize.c +++ b/app/gegl/gimpoperationposterize.c @@ -36,7 +36,8 @@ static gboolean gimp_operation_posterize_process (GeglOperation *operation void *in_buf, void *out_buf, glong samples, - const GeglRectangle *roi); + const GeglRectangle *roi, + gint level); G_DEFINE_TYPE (GimpOperationPosterize, gimp_operation_posterize, @@ -81,7 +82,8 @@ gimp_operation_posterize_process (GeglOperation *operation, void *in_buf, void *out_buf, glong samples, - const GeglRectangle *roi) + const GeglRectangle *roi, + gint level) { GimpOperationPointFilter *point = GIMP_OPERATION_POINT_FILTER (operation); GimpPosterizeConfig *config = GIMP_POSTERIZE_CONFIG (point->config); diff --git a/app/gegl/gimpoperationreplacemode.c b/app/gegl/gimpoperationreplacemode.c index 8ae8d6b08e..ba77b2ade7 100644 --- a/app/gegl/gimpoperationreplacemode.c +++ b/app/gegl/gimpoperationreplacemode.c @@ -33,7 +33,8 @@ static gboolean gimp_operation_replace_mode_process (GeglOperation *operat void *aux_buf, void *out_buf, glong samples, - const GeglRectangle *roi); + const GeglRectangle *roi, + gint level); G_DEFINE_TYPE (GimpOperationReplaceMode, gimp_operation_replace_mode, @@ -66,7 +67,8 @@ gimp_operation_replace_mode_process (GeglOperation *operation, void *aux_buf, void *out_buf, glong samples, - const GeglRectangle *roi) + const GeglRectangle *roi, + gint level) { gfloat *in = in_buf; gfloat *layer = aux_buf; diff --git a/app/gegl/gimpoperationsaturationmode.c b/app/gegl/gimpoperationsaturationmode.c index ee7c8b0b57..34c8774b4e 100644 --- a/app/gegl/gimpoperationsaturationmode.c +++ b/app/gegl/gimpoperationsaturationmode.c @@ -33,7 +33,8 @@ static gboolean gimp_operation_saturation_mode_process (GeglOperation *ope void *aux_buf, void *out_buf, glong samples, - const GeglRectangle *roi); + const GeglRectangle *roi, + gint level); G_DEFINE_TYPE (GimpOperationSaturationMode, gimp_operation_saturation_mode, @@ -66,7 +67,8 @@ gimp_operation_saturation_mode_process (GeglOperation *operation, void *aux_buf, void *out_buf, glong samples, - const GeglRectangle *roi) + const GeglRectangle *roi, + gint level) { gfloat *in = in_buf; gfloat *layer = aux_buf; diff --git a/app/gegl/gimpoperationscreenmode.c b/app/gegl/gimpoperationscreenmode.c index 2361236044..89187383e3 100644 --- a/app/gegl/gimpoperationscreenmode.c +++ b/app/gegl/gimpoperationscreenmode.c @@ -33,7 +33,8 @@ static gboolean gimp_operation_screen_mode_process (GeglOperation *operati void *aux_buf, void *out_buf, glong samples, - const GeglRectangle *roi); + const GeglRectangle *roi, + gint level); G_DEFINE_TYPE (GimpOperationScreenMode, gimp_operation_screen_mode, @@ -66,7 +67,8 @@ gimp_operation_screen_mode_process (GeglOperation *operation, void *aux_buf, void *out_buf, glong samples, - const GeglRectangle *roi) + const GeglRectangle *roi, + gint level) { gfloat *in = in_buf; gfloat *layer = aux_buf; diff --git a/app/gegl/gimpoperationsoftlightmode.c b/app/gegl/gimpoperationsoftlightmode.c index ea024b4370..dfd024bb9c 100644 --- a/app/gegl/gimpoperationsoftlightmode.c +++ b/app/gegl/gimpoperationsoftlightmode.c @@ -33,7 +33,8 @@ static gboolean gimp_operation_softlight_mode_process (GeglOperation *oper void *aux_buf, void *out_buf, glong samples, - const GeglRectangle *roi); + const GeglRectangle *roi, + gint level); G_DEFINE_TYPE (GimpOperationSoftlightMode, gimp_operation_softlight_mode, @@ -66,7 +67,8 @@ gimp_operation_softlight_mode_process (GeglOperation *operation, void *aux_buf, void *out_buf, glong samples, - const GeglRectangle *roi) + const GeglRectangle *roi, + gint level) { gfloat *in = in_buf; gfloat *layer = aux_buf; diff --git a/app/gegl/gimpoperationsubtractmode.c b/app/gegl/gimpoperationsubtractmode.c index c465c81787..00d96bdc9c 100644 --- a/app/gegl/gimpoperationsubtractmode.c +++ b/app/gegl/gimpoperationsubtractmode.c @@ -33,7 +33,8 @@ static gboolean gimp_operation_subtract_mode_process (GeglOperation *opera void *aux_buf, void *out_buf, glong samples, - const GeglRectangle *roi); + const GeglRectangle *roi, + gint level); G_DEFINE_TYPE (GimpOperationSubtractMode, gimp_operation_subtract_mode, @@ -66,7 +67,8 @@ gimp_operation_subtract_mode_process (GeglOperation *operation, void *aux_buf, void *out_buf, glong samples, - const GeglRectangle *roi) + const GeglRectangle *roi, + gint level) { gfloat *in = in_buf; gfloat *layer = aux_buf; diff --git a/app/gegl/gimpoperationthreshold.c b/app/gegl/gimpoperationthreshold.c index 8809b500c5..ade57372ea 100644 --- a/app/gegl/gimpoperationthreshold.c +++ b/app/gegl/gimpoperationthreshold.c @@ -35,7 +35,8 @@ static gboolean gimp_operation_threshold_process (GeglOperation *operation void *in_buf, void *out_buf, glong samples, - const GeglRectangle *roi); + const GeglRectangle *roi, + gint level); G_DEFINE_TYPE (GimpOperationThreshold, gimp_operation_threshold, @@ -80,7 +81,8 @@ gimp_operation_threshold_process (GeglOperation *operation, void *in_buf, void *out_buf, glong samples, - const GeglRectangle *roi) + const GeglRectangle *roi, + gint level) { GimpOperationPointFilter *point = GIMP_OPERATION_POINT_FILTER (operation); GimpThresholdConfig *config = GIMP_THRESHOLD_CONFIG (point->config); diff --git a/app/gegl/gimpoperationtilesink.c b/app/gegl/gimpoperationtilesink.c index 2762fd6e36..46ed9e8f01 100644 --- a/app/gegl/gimpoperationtilesink.c +++ b/app/gegl/gimpoperationtilesink.c @@ -62,7 +62,8 @@ static void gimp_operation_tile_sink_set_property (GObject *object, static gboolean gimp_operation_tile_sink_process (GeglOperation *operation, GeglBuffer *input, - const GeglRectangle *result); + const GeglRectangle *result, + gint level); G_DEFINE_TYPE (GimpOperationTileSink, gimp_operation_tile_sink, @@ -192,7 +193,8 @@ gimp_operation_tile_sink_set_property (GObject *object, static gboolean gimp_operation_tile_sink_process (GeglOperation *operation, GeglBuffer *input, - const GeglRectangle *result) + const GeglRectangle *result, + gint level) { GimpOperationTileSink *self = GIMP_OPERATION_TILE_SINK (operation); static GStaticMutex mutex = G_STATIC_MUTEX_INIT; @@ -217,8 +219,8 @@ gimp_operation_tile_sink_process (GeglOperation *operation, { GeglRectangle rect = { destPR.x, destPR.y, destPR.w, destPR.h }; - gegl_buffer_get (input, - 1.0, &rect, format, destPR.data, destPR.rowstride); + gegl_buffer_get (input, &rect, 1.0, + format, destPR.data, destPR.rowstride); } g_static_mutex_lock (&mutex); diff --git a/app/gegl/gimpoperationtilesource.c b/app/gegl/gimpoperationtilesource.c index 13fa56f4f3..d99baca794 100644 --- a/app/gegl/gimpoperationtilesource.c +++ b/app/gegl/gimpoperationtilesource.c @@ -57,7 +57,8 @@ static GeglRectangle gimp_operation_tile_source_get_bounding_box (GeglOperation *operation); static gboolean gimp_operation_tile_source_process (GeglOperation *operation, GeglBuffer *output, - const GeglRectangle *result); + const GeglRectangle *result, + gint level); G_DEFINE_TYPE (GimpOperationTileSource, gimp_operation_tile_source, @@ -209,7 +210,8 @@ gimp_operation_tile_source_get_bounding_box (GeglOperation *operation) static gboolean gimp_operation_tile_source_process (GeglOperation *operation, GeglBuffer *output, - const GeglRectangle *result) + const GeglRectangle *result, + gint level) { GimpOperationTileSource *self = GIMP_OPERATION_TILE_SOURCE (operation); const Babl *format; @@ -233,7 +235,7 @@ gimp_operation_tile_source_process (GeglOperation *operation, { GeglRectangle rect = { srcPR.x, srcPR.y, srcPR.w, srcPR.h }; - gegl_buffer_set (output, &rect, format, srcPR.data, srcPR.rowstride); + gegl_buffer_set (output, &rect, 0, format, srcPR.data, srcPR.rowstride); } return TRUE; diff --git a/app/gegl/gimpoperationvaluemode.c b/app/gegl/gimpoperationvaluemode.c index 77eb63c421..3d016f2add 100644 --- a/app/gegl/gimpoperationvaluemode.c +++ b/app/gegl/gimpoperationvaluemode.c @@ -33,7 +33,8 @@ static gboolean gimp_operation_value_mode_process (GeglOperation *operatio void *aux_buf, void *out_buf, glong samples, - const GeglRectangle *roi); + const GeglRectangle *roi, + gint level); G_DEFINE_TYPE (GimpOperationValueMode, gimp_operation_value_mode, @@ -66,7 +67,8 @@ gimp_operation_value_mode_process (GeglOperation *operation, void *aux_buf, void *out_buf, glong samples, - const GeglRectangle *roi) + const GeglRectangle *roi, + gint level) { gfloat *in = in_buf; gfloat *layer = aux_buf;