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

when using a source operation, blend its output over the original image

Browse source 
2008-02-06  Michael Natterer  <mitch@gimp.org>

	* app/core/gimpimagemap.c (gimp_image_map_apply): when using a
	source operation, blend its output over the original image using
	"over" instead of simply replacing the original image.


svn path=/trunk/; revision=24819
This commit is contained in:
Michael Natterer 2008-02-06 11:02:31 +00:00 committed by Michael Natterer
parent 84939f1652
commit e9faafdeb9
2 changed files with 33 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2008-02-06 Michael Natterer <mitch@gimp.org>
* app/core/gimpimagemap.c (gimp_image_map_apply): when using a
source operation, blend its output over the original image using
"over" instead of simply replacing the original image.
2008-02-06 Michael Natterer <mitch@gimp.org>
* app/tools/gimpgegltool.c (gimp_param_spec_duplicate)

53
app/core/gimpimagemap.c
View file

@ -434,20 +434,15 @@ gimp_image_map_apply (GimpImageMap *image_map,
{
image_map->gegl = gegl_node_new ();
if (gegl_node_get_pad (image_map->operation, "input"))
{
g_printerr ("%s: found input property\n", G_STRFUNC);
image_map->input =
gegl_node_new_child (image_map->gegl,
"operation", "gimp-tilemanager-source",
NULL);
image_map->input =
gegl_node_new_child (image_map->gegl,
"operation", "gimp-tilemanager-source",
NULL);
image_map->shift =
gegl_node_new_child (image_map->gegl,
"operation", "shift",
NULL);
}
image_map->shift =
gegl_node_new_child (image_map->gegl,
"operation", "shift",
NULL);
gegl_node_add_child (image_map->gegl, image_map->operation);
@ -470,7 +465,7 @@ gimp_image_map_apply (GimpImageMap *image_map,
g_object_unref (sink_operation);
}
if (image_map->input)
if (gegl_node_get_pad (image_map->operation, "input"))
{
gegl_node_link_many (image_map->input,
image_map->shift,
@ -480,24 +475,30 @@ gimp_image_map_apply (GimpImageMap *image_map,
}
else
{
gegl_node_link_many (image_map->operation,
GeglNode *over = gegl_node_new_child (image_map->gegl,
"operation", "over",
NULL);
gegl_node_link_many (image_map->input,
image_map->shift,
over,
image_map->output,
NULL);
gegl_node_connect_to (image_map->operation, "output",
over, "aux");
}
}
if (image_map->input)
{
gegl_node_set (image_map->input,
"tile-manager", image_map->undo_tiles,
"linear", TRUE,
NULL);
gegl_node_set (image_map->input,
"tile-manager", image_map->undo_tiles,
"linear", TRUE,
NULL);
gegl_node_set (image_map->shift,
"x", (gdouble) rect.x,
"y", (gdouble) rect.y,
NULL);
}
gegl_node_set (image_map->shift,
"x", (gdouble) rect.x,
"y", (gdouble) rect.y,
NULL);
gegl_node_set (image_map->output,
"tile-manager", gimp_drawable_get_shadow_tiles (image_map->drawable),