dallasgroot/Gimp
dallasgroot/Gimp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

app: use gegl_node_link and gegl_node_link_many

Browse source 
Instead of gegl_node_connect_to which is rather verbose, and slated for
deprecation in GEGL.
This commit is contained in:
Øyvind Kolås 2023-06-13 17:05:02 +02:00
parent fe985c3961
commit e7dcfb2927
14 changed files with 46 additions and 103 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/core/gimpchannel.c
View file

@ -400,8 +400,7 @@ gimp_channel_get_node (GimpFilter *filter)
channel->mask_node = gegl_node_new_child (node,
"operation", "gegl:opacity",
NULL);
gegl_node_connect_to (channel->color_node, "output",
channel->mask_node, "input");
gegl_node_link (channel->color_node, channel->mask_node);
g_warn_if_fail (channel->invert_node == NULL);
@ -411,8 +410,7 @@ gimp_channel_get_node (GimpFilter *filter)
if (channel->show_masked)
{
gegl_node_connect_to (source, "output",
channel->invert_node, "input");
gegl_node_link (source, channel->invert_node);
gegl_node_connect_to (channel->invert_node, "output",
channel->mask_node, "aux");
}
@ -1754,8 +1752,7 @@ gimp_channel_set_show_masked (GimpChannel *channel,
if (channel->show_masked)
{
gegl_node_connect_to (source, "output",
channel->invert_node, "input");
gegl_node_link (source, channel->invert_node);
gegl_node_connect_to (channel->invert_node, "output",
channel->mask_node, "aux");
}

6
app/core/gimpdrawable-floating-selection.c
View file

@ -228,8 +228,7 @@ _gimp_drawable_add_floating_sel_filter (GimpDrawable *drawable)
"operation", "gegl:nop",
NULL);
gegl_node_connect_to (fs_source, "output",
private->fs_crop_node, "input");
gegl_node_link (fs_source, private->fs_crop_node);
gegl_node_connect_to (private->fs_crop_node, "output",
node, "aux");
@ -307,8 +306,7 @@ gimp_drawable_remove_fs_filter (GimpDrawable *drawable)
{
gegl_node_add_child (gimp_filter_get_node (GIMP_FILTER (fs)),
fs_source);
gegl_node_connect_to (fs_source, "output",
fs->layer_offset_node, "input");
gegl_node_link (fs_source, fs->layer_offset_node);
}
g_clear_object (&private->fs_filter);

2
app/core/gimpdrawable-foreground-extract.c
View file

@ -117,7 +117,7 @@ gimp_drawable_foreground_extract (GimpDrawable *drawable,
"y", 1.0 * off_y,
NULL);
gegl_node_connect_to (trimap_node, "output", pre, "input");
gegl_node_link (trimap_node, pre);
gegl_node_connect_to (pre, "output", matting_node, "aux");
gegl_node_link_many (input_node, matting_node, post, output_node, NULL);
}

3
app/core/gimpdrawable-histogram.c
View file

@ -90,8 +90,7 @@ gimp_drawable_calculate_histogram_internal (GimpDrawable *drawable,
"histogram", histogram,
NULL);
gegl_node_connect_to (source, "output",
histogram_sink, "input");
gegl_node_link (source, histogram_sink);
if (! gimp_channel_is_empty (mask))
{

15
app/core/gimpdrawable.c
View file

@ -481,10 +481,8 @@ gimp_drawable_get_node (GimpFilter *filter)
input = gegl_node_get_input_proxy (node, "input");
output = gegl_node_get_output_proxy (node, "output");
gegl_node_connect_to (input, "output",
drawable->private->mode_node, "input");
gegl_node_connect_to (drawable->private->mode_node, "output",
output, "input");
gegl_node_link (input, drawable->private->mode_node);
gegl_node_link (drawable->private->mode_node, output);
return node;
}
@ -1532,21 +1530,18 @@ gimp_drawable_get_source_node (GimpDrawable *drawable)
if (gegl_node_has_pad (source, "input"))
{
gegl_node_connect_to (input, "output",
source, "input");
gegl_node_link (input, source);
}
filter = gimp_filter_stack_get_graph (GIMP_FILTER_STACK (drawable->private->filter_stack));
gegl_node_add_child (drawable->private->source_node, filter);
gegl_node_connect_to (source, "output",
filter, "input");
gegl_node_link (source, filter);
output = gegl_node_get_output_proxy (drawable->private->source_node, "output");
gegl_node_connect_to (filter, "output",
output, "input");
gegl_node_link (filter, output);
if (gimp_drawable_get_floating_sel (drawable))
_gimp_drawable_add_floating_sel_filter (drawable);

15
app/core/gimpfilterstack.c
View file

@ -211,16 +211,14 @@ gimp_filter_stack_get_graph (GimpFilterStack *stack)
gegl_node_add_child (stack->graph, node);
gegl_node_connect_to (previous, "output",
node, "input");
gegl_node_link (previous, node);
previous = node;
}
output = gegl_node_get_output_proxy (stack->graph, "output");
gegl_node_connect_to (previous, "output",
output, "input");
gegl_node_link (previous, output);
return stack->graph;
}
@ -259,10 +257,8 @@ gimp_filter_stack_add_node (GimpFilterStack *stack,
node_below = gegl_node_get_producer (node_above, "input", NULL);
gegl_node_connect_to (node_below, "output",
node, "input");
gegl_node_connect_to (node, "output",
node_above, "input");
gegl_node_link (node_below, node);
gegl_node_link (node, node_above);
}
static void
@ -297,8 +293,7 @@ gimp_filter_stack_remove_node (GimpFilterStack *stack,
gegl_node_disconnect (node, "input");
gegl_node_connect_to (node_below, "output",
node_above, "input");
gegl_node_link (node_below, node_above);
}
static void

27
app/core/gimpgrouplayer.c
View file

@ -1136,8 +1136,7 @@ gimp_group_layer_get_source_node (GimpDrawable *drawable)
if (gegl_node_has_pad (private->parent_source_node, "input"))
{
gegl_node_connect_to (input, "output",
private->parent_source_node, "input");
gegl_node_link (input, private->parent_source_node);
}
/* make sure we have a graph */
@ -1432,8 +1431,7 @@ gimp_group_layer_get_graph (GimpProjectable *projectable)
gegl_node_add_child (private->graph, layers_node);
gegl_node_connect_to (input, "output",
layers_node, "input");
gegl_node_link (input, layers_node);
gimp_item_get_offset (GIMP_ITEM (group), &off_x, &off_y);
@ -1443,13 +1441,11 @@ gimp_group_layer_get_graph (GimpProjectable *projectable)
"y", (gdouble) -off_y,
NULL);
gegl_node_connect_to (layers_node, "output",
private->offset_node, "input");
gegl_node_link (layers_node, private->offset_node);
output = gegl_node_get_output_proxy (private->graph, "output");
gegl_node_connect_to (private->offset_node, "output",
output, "input");
gegl_node_link (private->offset_node, output);
return private->graph;
}
@ -1480,8 +1476,7 @@ gimp_group_layer_end_render (GimpProjectable *projectable)
input = gegl_node_get_input_proxy (private->source_node, "input");
gegl_node_connect_to (input, "output",
private->graph, "input");
gegl_node_link (input, private->graph);
}
}
@ -2203,17 +2198,14 @@ gimp_group_layer_update_source_node (GimpGroupLayer *group)
if (private->pass_through)
{
gegl_node_connect_to (input, "output",
private->graph, "input");
gegl_node_connect_to (private->graph, "output",
output, "input");
gegl_node_link (input, private->graph);
gegl_node_link (private->graph, output);
}
else
{
gegl_node_disconnect (private->graph, "input");
gegl_node_connect_to (private->parent_source_node, "output",
output, "input");
gegl_node_link (private->parent_source_node, output);
}
}
@ -2236,8 +2228,7 @@ gimp_group_layer_update_mode_node (GimpGroupLayer *group)
}
else
{
gegl_node_connect_to (input, "output",
mode_node, "input");
gegl_node_link (input, mode_node);
}
}

9
app/core/gimpimage.c
View file

@ -1743,21 +1743,18 @@ gimp_image_get_graph (GimpProjectable *projectable)
"alpha", 1.0,
NULL);
gegl_node_connect_to (layers_node, "output",
private->visible_mask, "input");
gegl_node_link (layers_node, private->visible_mask);
channels_node =
gimp_filter_stack_get_graph (GIMP_FILTER_STACK (private->channels->container));
gegl_node_add_child (private->graph, channels_node);
gegl_node_connect_to (private->visible_mask, "output",
channels_node, "input");
gegl_node_link (private->visible_mask, channels_node);
output = gegl_node_get_output_proxy (private->graph, "output");
gegl_node_connect_to (channels_node, "output",
output, "input");
gegl_node_link (channels_node, output);
return private->graph;
}

12
app/gegl/gimp-gegl-apply-operation.c
View file

@ -256,8 +256,7 @@ gimp_gegl_apply_cached_operation (GeglBuffer *src_buffer,
"height", (gdouble) dest_rect->height,
NULL);
gegl_node_connect_to (src_node, "output",
crop_node, "input");
gegl_node_link (src_node, crop_node);
src_node = crop_node;
}
@ -272,8 +271,7 @@ gimp_gegl_apply_cached_operation (GeglBuffer *src_buffer,
effect, "aux");
}
gegl_node_connect_to (src_node, "output",
effect, "input");
gegl_node_link (src_node, effect);
}
dest_node = gegl_node_new_child (gegl,
@ -281,8 +279,7 @@ gimp_gegl_apply_cached_operation (GeglBuffer *src_buffer,
"buffer", result_buffer,
NULL);
gegl_node_connect_to (effect, "output",
dest_node, "input");
gegl_node_link (effect, dest_node);
iter = gimp_chunk_iterator_new (region);
@ -358,8 +355,7 @@ gimp_gegl_apply_cached_operation (GeglBuffer *src_buffer,
if (operation_src_node)
{
gegl_node_connect_to (operation_src_node, "output",
operation, "input");
gegl_node_link (operation_src_node, operation);
}
if (progress_started)

13
app/gegl/gimp-gegl-nodes.c
View file

@ -78,10 +78,7 @@ gimp_gegl_create_flatten_node (const GimpRGB *background,
gegl_node_connect_to (input, "output",
mode, "aux");
gegl_node_connect_to (color, "output",
mode, "input");
gegl_node_connect_to (mode, "output",
output, "input");
gegl_node_link_many (color, mode, output, NULL);
return node;
}
@ -116,12 +113,9 @@ gimp_gegl_create_apply_opacity_node (GeglBuffer *mask,
mask_offset_x,
mask_offset_y);
gegl_node_connect_to (input, "output",
opacity_node, "input");
gegl_node_link_many (input, opacity_node, output, NULL);
gegl_node_connect_to (mask_source, "output",
opacity_node, "aux");
gegl_node_connect_to (opacity_node, "output",
output, "input");
return node;
}
@ -167,8 +161,7 @@ gimp_gegl_add_buffer_source (GeglNode *parent,
"y", (gdouble) offset_y,
NULL);
gegl_node_connect_to (buffer_source, "output",
translate, "input");
gegl_node_link (buffer_source, translate);
buffer_source = translate;
}

9
app/gegl/gimpapplicator.c
View file

@ -139,8 +139,7 @@ gimp_applicator_new (GeglNode *parent)
gimp_gegl_mode_node_set_opacity (applicator->mode_node,
applicator->opacity);
gegl_node_connect_to (applicator->input_node, "output",
applicator->mode_node, "input");
gegl_node_link (applicator->input_node, applicator->mode_node);
applicator->apply_offset_node =
gegl_node_new_child (applicator->node,
@ -164,8 +163,7 @@ gimp_applicator_new (GeglNode *parent)
"operation", "gegl:translate",
NULL);
gegl_node_connect_to (applicator->mask_node, "output",
applicator->mask_offset_node, "input");
gegl_node_link (applicator->mask_node, applicator->mask_offset_node);
/* don't connect the the mask offset node to mode's aux2 yet */
applicator->affect_node =
@ -386,8 +384,7 @@ gimp_applicator_set_apply_buffer (GimpApplicator *applicator,
}
else if (applicator->apply_buffer)
{
gegl_node_connect_to (applicator->aux_node, "output",
applicator->apply_offset_node, "input");
gegl_node_link (applicator->aux_node, applicator->apply_offset_node);
}
applicator->apply_buffer = apply_buffer;

12
app/tools/gimpcagetool.c
View file

@ -1187,8 +1187,7 @@ gimp_cage_tool_compute_coef (GimpCageTool *ct)
"format", format,
NULL);
gegl_node_connect_to (input, "output",
output, "input");
gegl_node_link (input, output);
processor = gegl_node_new_processor (output, NULL);
@ -1240,20 +1239,17 @@ gimp_cage_tool_create_render_node (GimpCageTool *ct)
"operation", "gegl:map-absolute",
NULL);
gegl_node_connect_to (input, "output",
ct->cage_node, "input");
gegl_node_link (input, ct->cage_node);
gegl_node_connect_to (ct->coef_node, "output",
ct->cage_node, "aux");
gegl_node_connect_to (input, "output",
render, "input");
gegl_node_link (input, render);
gegl_node_connect_to (ct->cage_node, "output",
render, "aux");
gegl_node_connect_to (render, "output",
output, "input");
gegl_node_link (render, output);
gimp_gegl_progress_connect (ct->cage_node, GIMP_PROGRESS (ct),
_("Cage Transform"));

8
app/tools/gimpseamlessclonetool.c
View file

@ -692,20 +692,14 @@ gimp_seamless_clone_tool_create_render_node (GimpSeamlessCloneTool *sc)
"operation", "svg:dst-over",
NULL);
gegl_node_connect_to (input, "output",
op, "input");
gegl_node_link_many (input, op, overlay, output, NULL);
gegl_node_connect_to (paste, "output",
op, "aux");
gegl_node_connect_to (op, "output",
overlay, "input");
gegl_node_connect_to (input, "output",
overlay, "aux");
gegl_node_connect_to (overlay, "output",
output, "input");
sc->render_node = node;
sc->sc_node = op;

9
app/tools/gimpwarptool.c
View file

@ -1065,14 +1065,10 @@ gimp_warp_tool_create_graph (GimpWarpTool *wt)
"abyss-policy", options->abyss_policy,
NULL);
gegl_node_connect_to (input, "output",
render, "input");
gegl_node_link_many (input, render, output, NULL);
gegl_node_connect_to (coords, "output",
render, "aux");
gegl_node_connect_to (render, "output",
output, "input");
wt->graph = graph;
wt->render_node = render;
@ -1373,8 +1369,7 @@ gimp_warp_tool_add_op (GimpWarpTool *wt,
last_op = gegl_node_get_producer (wt->render_node, "aux", NULL);
gegl_node_disconnect (wt->render_node, "aux");
gegl_node_connect_to (last_op, "output",
op , "input");
gegl_node_link (last_op, op);
gegl_node_connect_to (op, "output",
wt->render_node, "aux");
}