callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "app: avoid NULL output in layer-mode ops"

Browse Source 
On a second thought... nope :)  We'll fix it another way.

This reverts commit 60947b7a34826657395ca485d334ccb302106e07.

(cherry picked from commit 3766af9ac9)
This commit is contained in:
Ell
2019-05-31 12:59:17 -04:00
parent 818570d6cc
commit e457ddf993
2 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/operations/layer-modes/gimpoperationlayermode.c
View File

@ -450,12 +450,7 @@ gimp_operation_layer_mode_parent_process (GeglOperation *operation,
else else
{ {
/* ... the output is empty. */ /* ... the output is empty. */
gegl_operation_context_take_object ( gegl_operation_context_set_object (context, "output", NULL);
context, "output",
G_OBJECT (gegl_buffer_new (result,
gegl_operation_get_format (operation,
"output"))));
return TRUE; return TRUE;
} }
} }

11
app/operations/layer-modes/gimpoperationreplace.c
View File

@ -96,16 +96,9 @@ gimp_operation_replace_parent_process (GeglOperation *op,
{ {
GObject *aux; GObject *aux;
aux = gegl_operation_context_dup_object (context, "aux"); aux = gegl_operation_context_get_object (context, "aux");
if (! aux) gegl_operation_context_set_object (context, "output", aux);
{
aux = G_OBJECT (
gegl_buffer_new (result,
gegl_operation_get_format (op, "output")));
}
gegl_operation_context_take_object (context, "output", aux);
return TRUE; return TRUE;
} }