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

app: use gimp_gegl_color_new() instead of gegl_color_set_rgba()

Browse Source
This commit is contained in:
Michael Natterer
2012-04-16 00:53:50 +02:00
parent 66050390aa
commit 927ef9b9fb
2 changed files with 6 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/core/gimpchannel.c
View File

@ -882,12 +882,7 @@ gimp_channel_get_node (GimpItem *item)
source = gimp_drawable_get_source_node (drawable); source = gimp_drawable_get_source_node (drawable);
gegl_node_add_child (node, source); gegl_node_add_child (node, source);
color = gegl_color_new (NULL); color = gimp_gegl_color_new (&channel->color);
gegl_color_set_rgba (color,
channel->color.r,
channel->color.g,
channel->color.b,
channel->color.a);
g_warn_if_fail (channel->color_node == NULL); g_warn_if_fail (channel->color_node == NULL);
@ -1759,14 +1754,7 @@ gimp_channel_set_color (GimpChannel *channel,
if (channel->color_node) if (channel->color_node)
{ {
GeglColor *gegl_color; GeglColor *gegl_color = gimp_gegl_color_new (&channel->color);
gegl_color = gegl_color_new (NULL);
gegl_color_set_rgba (gegl_color,
channel->color.r,
channel->color.g,
channel->color.b,
channel->color.a);
gegl_node_set (channel->color_node, gegl_node_set (channel->color_node,
"value", gegl_color, "value", gegl_color,
@ -1825,14 +1813,7 @@ gimp_channel_set_opacity (GimpChannel *channel,
if (channel->color_node) if (channel->color_node)
{ {
GeglColor *gegl_color; GeglColor *gegl_color = gimp_gegl_color_new (&channel->color);
gegl_color = gegl_color_new (NULL);
gegl_color_set_rgba (gegl_color,
channel->color.r,
channel->color.g,
channel->color.b,
channel->color.a);
gegl_node_set (channel->color_node, gegl_node_set (channel->color_node,
"value", gegl_color, "value", gegl_color,

9
app/gegl/gimp-gegl-config-proxy.c
View File

@ -31,6 +31,7 @@
#include "core/gimpparamspecs-duplicate.h" #include "core/gimpparamspecs-duplicate.h"
#include "gimp-gegl-config-proxy.h" #include "gimp-gegl-config-proxy.h"
#include "gimp-gegl-utils.h"
static GHashTable *config_types = NULL; static GHashTable *config_types = NULL;
@ -278,17 +279,13 @@ gimp_gegl_config_proxy_sync (GimpObject *proxy,
if (GIMP_IS_PARAM_SPEC_RGB (gimp_pspec)) if (GIMP_IS_PARAM_SPEC_RGB (gimp_pspec))
{ {
GeglColor *gegl_color = gegl_color_new (NULL);
GimpRGB gimp_color; GimpRGB gimp_color;
GeglColor *gegl_color;
gimp_value_get_rgb (&value, &gimp_color); gimp_value_get_rgb (&value, &gimp_color);
g_value_unset (&value); g_value_unset (&value);
gegl_color_set_rgba (gegl_color, gegl_color = gimp_gegl_color_new (&gimp_color);
gimp_color.r,
gimp_color.g,
gimp_color.b,
gimp_color.a);
g_value_init (&value, gegl_pspec->value_type); g_value_init (&value, gegl_pspec->value_type);
g_value_take_object (&value, gegl_color); g_value_take_object (&value, gegl_color);