Commit 372414f9 authored by Øyvind Kolås's avatar Øyvind Kolås

%s/dynamic_id/context_id/g which is hopefully a rename in a sane

direction, probably not a final choice though.
* gegl/gegl-chant.h:
* gegl/gegl-cr-visitor.c: (visit_node):
* gegl/gegl-debug-rect-visitor.c: (visit_node):
* gegl/gegl-eval-mgr.c: (gegl_eval_mgr_apply):
* gegl/gegl-eval-visitor.c: (visit_pad):
* gegl/gegl-finish-visitor.c: (visit_node):
* gegl/gegl-need-visitor.c: (visit_node):
* gegl/gegl-node-dynamic.h:
* gegl/gegl-node.c: (gegl_node_set_need_rect),
(gegl_node_get_result_rect), (gegl_node_set_result_rect),
(gegl_node_get_need_rect), (lookup_dynamic),
(gegl_node_get_dynamic), (gegl_node_remove_dynamic),
(gegl_node_add_dynamic):
* gegl/gegl-node.h:
* gegl/gegl-operation-composer.c: (process), (calc_source_regions):
* gegl/gegl-operation-composer.h:
* gegl/gegl-operation-filter.c: (process), (calc_source_regions):
* gegl/gegl-operation-filter.h:
* gegl/gegl-operation-point-composer.c: (process_inner):
* gegl/gegl-operation-point-filter.c: (process_inner):
* gegl/gegl-operation-sink.c: (process), (calc_source_regions):
* gegl/gegl-operation-sink.h:
* gegl/gegl-operation-source.c: (process), (calc_source_regions):
* gegl/gegl-operation-source.h:
* gegl/gegl-operation.c: (gegl_operation_process),
(gegl_operation_calc_source_regions), (gegl_operation_prepare),
(gegl_operation_set_source_region), (calc_source_regions),
(gegl_operation_get_requested_region),
(gegl_operation_result_rect), (gegl_operation_get_data),
(gegl_operation_set_data):
* gegl/gegl-operation.h:
* gegl/gegl-prepare-visitor.c: (visit_node):
* gegl/gegl-visitor.c: (set_property), (get_property):
* gegl/gegl-visitor.h:
* operations/blur/box-blur.c: (process), (get_source_rect),
(calc_source_regions):
* operations/blur/gaussian-blur.c: (process), (get_source_rect),
(calc_source_regions):
* operations/color/remap.c: (process), (get_source_rect),
(calc_source_regions):
* operations/color/stretch-contrast.c: (process),
(calc_source_regions):
* operations/core/buffer.c: (process):
* operations/core/clone.c: (process):
* operations/core/crop.c: (process), (calc_source_regions):
* operations/core/nop.c: (process):
* operations/core/save-buffer.c: (process):
* operations/core/shift.c: (process), (calc_source_regions):
* operations/display/display.c: (process):
* operations/file-io/exr-load.cpp:
* operations/file-io/jpg-load.c: (process):
* operations/file-io/load.c: (prepare):
* operations/file-io/magick-load.c: (process):
* operations/file-io/pixbuf.c: (process):
* operations/file-io/png-load.c: (process), (get_defined_region):
* operations/file-io/png-save.c: (process):
* operations/file-io/raw-load.c: (process):
* operations/file-io/svg-load.c: (process):
* operations/meta/layer.c: (prepare):
* operations/render/FractalExplorer.c: (process):
* operations/render/checkerboard.c: (process):
* operations/render/color.c: (process):
* operations/render/introspect.c: (process):
* operations/render/noise.c: (process):
* operations/render/text.c: (process):
* operations/transform/affine.c: (calc_source_regions), (process):
* operations/workshop/box-max.c: (process), (get_source_rect),
(calc_source_regions):
* operations/workshop/box-min.c: (process), (get_source_rect),
(calc_source_regions):
* operations/workshop/demosaic-simple.c: (process),
(get_source_rect), (calc_source_regions):
* operations/workshop/gtk-display.c: (process):
* operations/workshop/mandelbrot.c: (process):
* operations/workshop/rawbayer-load.c: (process):
parent 38b03a0a
2006-12-29 Øyvind Kolås <pippin@gimp.org>
%s/dynamic_id/context_id/g which is hopefully a rename in a sane
direction, probably not a final choice though.
* gegl/gegl-chant.h:
* gegl/gegl-cr-visitor.c: (visit_node):
* gegl/gegl-debug-rect-visitor.c: (visit_node):
* gegl/gegl-eval-mgr.c: (gegl_eval_mgr_apply):
* gegl/gegl-eval-visitor.c: (visit_pad):
* gegl/gegl-finish-visitor.c: (visit_node):
* gegl/gegl-need-visitor.c: (visit_node):
* gegl/gegl-node-dynamic.h:
* gegl/gegl-node.c: (gegl_node_set_need_rect),
(gegl_node_get_result_rect), (gegl_node_set_result_rect),
(gegl_node_get_need_rect), (lookup_dynamic),
(gegl_node_get_dynamic), (gegl_node_remove_dynamic),
(gegl_node_add_dynamic):
* gegl/gegl-node.h:
* gegl/gegl-operation-composer.c: (process), (calc_source_regions):
* gegl/gegl-operation-composer.h:
* gegl/gegl-operation-filter.c: (process), (calc_source_regions):
* gegl/gegl-operation-filter.h:
* gegl/gegl-operation-point-composer.c: (process_inner):
* gegl/gegl-operation-point-filter.c: (process_inner):
* gegl/gegl-operation-sink.c: (process), (calc_source_regions):
* gegl/gegl-operation-sink.h:
* gegl/gegl-operation-source.c: (process), (calc_source_regions):
* gegl/gegl-operation-source.h:
* gegl/gegl-operation.c: (gegl_operation_process),
(gegl_operation_calc_source_regions), (gegl_operation_prepare),
(gegl_operation_set_source_region), (calc_source_regions),
(gegl_operation_get_requested_region),
(gegl_operation_result_rect), (gegl_operation_get_data),
(gegl_operation_set_data):
* gegl/gegl-operation.h:
* gegl/gegl-prepare-visitor.c: (visit_node):
* gegl/gegl-visitor.c: (set_property), (get_property):
* gegl/gegl-visitor.h:
* operations/blur/box-blur.c: (process), (get_source_rect),
(calc_source_regions):
* operations/blur/gaussian-blur.c: (process), (get_source_rect),
(calc_source_regions):
* operations/color/remap.c: (process), (get_source_rect),
(calc_source_regions):
* operations/color/stretch-contrast.c: (process),
(calc_source_regions):
* operations/core/buffer.c: (process):
* operations/core/clone.c: (process):
* operations/core/crop.c: (process), (calc_source_regions):
* operations/core/nop.c: (process):
* operations/core/save-buffer.c: (process):
* operations/core/shift.c: (process), (calc_source_regions):
* operations/display/display.c: (process):
* operations/file-io/exr-load.cpp:
* operations/file-io/jpg-load.c: (process):
* operations/file-io/load.c: (prepare):
* operations/file-io/magick-load.c: (process):
* operations/file-io/pixbuf.c: (process):
* operations/file-io/png-load.c: (process), (get_defined_region):
* operations/file-io/png-save.c: (process):
* operations/file-io/raw-load.c: (process):
* operations/file-io/svg-load.c: (process):
* operations/meta/layer.c: (prepare):
* operations/render/FractalExplorer.c: (process):
* operations/render/checkerboard.c: (process):
* operations/render/color.c: (process):
* operations/render/introspect.c: (process):
* operations/render/noise.c: (process):
* operations/render/text.c: (process):
* operations/transform/affine.c: (calc_source_regions), (process):
* operations/workshop/box-max.c: (process), (get_source_rect),
(calc_source_regions):
* operations/workshop/box-min.c: (process), (get_source_rect),
(calc_source_regions):
* operations/workshop/demosaic-simple.c: (process),
(get_source_rect), (calc_source_regions):
* operations/workshop/gtk-display.c: (process):
* operations/workshop/mandelbrot.c: (process):
* operations/workshop/rawbayer-load.c: (process):
2006-12-29 Øyvind Kolås <pippin@gimp.org>
* bin/gegl-node-editor.c: (scalar_expose): removed some visual noise
......
......@@ -384,7 +384,7 @@ static gboolean process (GeglOperation *operation,
#else
#ifndef GEGL_CHANT_META
static gboolean process (GeglOperation *operation,
gpointer dynamic_id);
gpointer context_id);
#endif
#endif
#endif
......
......@@ -59,7 +59,7 @@ static void
visit_node (GeglVisitor *self,
GeglNode *node)
{
GeglNodeDynamic *dynamic = gegl_node_get_dynamic (node, self->dynamic_id);
GeglNodeDynamic *dynamic = gegl_node_get_dynamic (node, self->context_id);
GEGL_VISITOR_CLASS (gegl_cr_visitor_parent_class)->visit_node (self, node);
gegl_rect_intersect (&dynamic->result_rect, &node->have_rect, &dynamic->need_rect);
......
......@@ -60,7 +60,7 @@ static void
visit_node (GeglVisitor *self,
GeglNode *node)
{
GeglNodeDynamic *dynamic = gegl_node_get_dynamic (node, self->dynamic_id);
GeglNodeDynamic *dynamic = gegl_node_get_dynamic (node, self->context_id);
GEGL_VISITOR_CLASS (gegl_debug_rect_visitor_parent_class)->visit_node (self, node);
g_warning (
......
......@@ -83,7 +83,7 @@ gegl_eval_mgr_apply (GeglEvalMgr *self,
GeglPad *pad;
gint i;
glong time = gegl_ticks ();
gpointer dynamic_id = self;
gpointer context_id = self;
g_assert (GEGL_IS_EVAL_MGR (self));
g_assert (GEGL_IS_NODE (root));
......@@ -102,12 +102,12 @@ gegl_eval_mgr_apply (GeglEvalMgr *self,
for (i=0;i<2;i++)
{
prepare_visitor = g_object_new (GEGL_TYPE_PREPARE_VISITOR, "id", dynamic_id, NULL);
prepare_visitor = g_object_new (GEGL_TYPE_PREPARE_VISITOR, "id", context_id, NULL);
gegl_visitor_dfs_traverse (prepare_visitor, GEGL_VISITABLE(root));
g_object_unref (prepare_visitor);
}
have_visitor = g_object_new (GEGL_TYPE_HAVE_VISITOR, "id", dynamic_id, NULL);
have_visitor = g_object_new (GEGL_TYPE_HAVE_VISITOR, "id", context_id, NULL);
gegl_visitor_dfs_traverse (have_visitor, GEGL_VISITABLE(root));
g_object_unref (have_visitor);
......@@ -119,15 +119,15 @@ gegl_eval_mgr_apply (GeglEvalMgr *self,
self->roi = *root_have_rect;
}
gegl_node_set_need_rect (root, dynamic_id, self->roi.x, self->roi.y,
gegl_node_set_need_rect (root, context_id, self->roi.x, self->roi.y,
self->roi.w, self->roi.h);
root->is_root = TRUE;
need_visitor = g_object_new (GEGL_TYPE_NEED_VISITOR, "id", dynamic_id, NULL);
need_visitor = g_object_new (GEGL_TYPE_NEED_VISITOR, "id", context_id, NULL);
gegl_visitor_bfs_traverse (need_visitor, GEGL_VISITABLE(root));
g_object_unref (need_visitor);
cr_visitor = g_object_new (GEGL_TYPE_CR_VISITOR, "id", dynamic_id, NULL);
cr_visitor = g_object_new (GEGL_TYPE_CR_VISITOR, "id", context_id, NULL);
gegl_visitor_bfs_traverse (cr_visitor, GEGL_VISITABLE(root));
g_object_unref (cr_visitor);
......@@ -135,12 +135,12 @@ gegl_eval_mgr_apply (GeglEvalMgr *self,
{
GeglVisitor *debug_rect_visitor;
debug_rect_visitor = g_object_new (GEGL_TYPE_DEBUG_RECT_VISITOR, "id", dynamic_id, NULL);
debug_rect_visitor = g_object_new (GEGL_TYPE_DEBUG_RECT_VISITOR, "id", context_id, NULL);
gegl_visitor_dfs_traverse (debug_rect_visitor, GEGL_VISITABLE(root));
g_object_unref (debug_rect_visitor);
}
eval_visitor = g_object_new (GEGL_TYPE_EVAL_VISITOR, "id", dynamic_id, NULL);
eval_visitor = g_object_new (GEGL_TYPE_EVAL_VISITOR, "id", context_id, NULL);
gegl_visitor_dfs_traverse (eval_visitor, GEGL_VISITABLE(pad));
g_object_unref (eval_visitor);
......@@ -151,7 +151,7 @@ gegl_eval_mgr_apply (GeglEvalMgr *self,
g_warning ("---------------------");
debug_rect_visitor = g_object_new (GEGL_TYPE_DEBUG_RECT_VISITOR, "id", dynamic_id, NULL);
debug_rect_visitor = g_object_new (GEGL_TYPE_DEBUG_RECT_VISITOR, "id", context_id, NULL);
gegl_visitor_dfs_traverse (debug_rect_visitor, GEGL_VISITABLE(root));
g_object_unref (debug_rect_visitor);
}
......@@ -160,14 +160,14 @@ gegl_eval_mgr_apply (GeglEvalMgr *self,
/* extract return buffer before running finish visitor */
GValue value={0,};
g_value_init (&value, G_TYPE_OBJECT);
gegl_node_dynamic_get_property (gegl_node_get_dynamic (root, dynamic_id),
gegl_node_dynamic_get_property (gegl_node_get_dynamic (root, context_id),
"output", &value);
buffer = g_value_get_object (&value);
g_object_ref (buffer); /* salvage buffer from finalization */
g_value_unset (&value);
}
finish_visitor = g_object_new (GEGL_TYPE_FINISH_VISITOR, "id", dynamic_id, NULL);
finish_visitor = g_object_new (GEGL_TYPE_FINISH_VISITOR, "id", context_id, NULL);
gegl_visitor_dfs_traverse (finish_visitor, GEGL_VISITABLE(root));
g_object_unref (finish_visitor);
......
......@@ -62,8 +62,8 @@ visit_pad (GeglVisitor *self,
GeglPad *pad)
{
GeglNode *node = gegl_pad_get_node (pad);
gpointer dynamic_id = self->dynamic_id;
GeglNodeDynamic *dynamic = gegl_node_get_dynamic (node, dynamic_id);
gpointer context_id = self->context_id;
GeglNodeDynamic *dynamic = gegl_node_get_dynamic (node, context_id);
GeglOperation *operation = node->operation;
GEGL_VISITOR_CLASS (gegl_eval_visitor_parent_class)->visit_pad (self, pad);
......@@ -72,7 +72,7 @@ visit_pad (GeglVisitor *self,
{
glong time = gegl_ticks ();
glong babl_time = babl_total_usecs;
gegl_operation_process (operation, dynamic_id, gegl_pad_get_name (pad));
gegl_operation_process (operation, context_id, gegl_pad_get_name (pad));
babl_time = babl_total_usecs - babl_time;
time = gegl_ticks ()-time;
......@@ -90,7 +90,7 @@ visit_pad (GeglVisitor *self,
GValue value = { 0 };
GParamSpec *prop_spec = gegl_pad_get_param_spec (pad);
GeglNode *source_node = gegl_pad_get_node (source_pad);
GeglNodeDynamic *source_dynamic = gegl_node_get_dynamic (source_node, dynamic_id);
GeglNodeDynamic *source_dynamic = gegl_node_get_dynamic (source_node, context_id);
g_value_init (&value, G_PARAM_SPEC_VALUE_TYPE (prop_spec));
......@@ -109,10 +109,10 @@ visit_pad (GeglVisitor *self,
gegl_pad_get_name (pad),
&value);
/* reference counting for this source dropped to zero, freeing up */
if (--gegl_node_get_dynamic(gegl_pad_get_node (source_pad), dynamic_id)->refs==0 &&
if (--gegl_node_get_dynamic(gegl_pad_get_node (source_pad), context_id)->refs==0 &&
g_value_get_object (&value))
{
gegl_node_dynamic_remove_property (gegl_node_get_dynamic (gegl_pad_get_node (source_pad), dynamic_id), gegl_pad_get_name (source_pad));
gegl_node_dynamic_remove_property (gegl_node_get_dynamic (gegl_pad_get_node (source_pad), context_id), gegl_pad_get_name (source_pad));
}
g_value_unset (&value);
......
......@@ -76,5 +76,5 @@ visit_node (GeglVisitor *self,
}
}
gegl_node_remove_dynamic (node, self->dynamic_id);
gegl_node_remove_dynamic (node, self->context_id);
}
......@@ -57,8 +57,8 @@ visit_node (GeglVisitor *self,
GeglNode *node)
{
GeglOperation *operation = node->operation;
gpointer dynamic_id = self->dynamic_id;
gpointer context_id = self->context_id;
GEGL_VISITOR_CLASS (gegl_need_visitor_parent_class)->visit_node (self, node);
gegl_operation_calc_source_regions (operation, dynamic_id);
gegl_operation_calc_source_regions (operation, context_id);
}
......@@ -40,7 +40,7 @@ struct _GeglNodeDynamic
{
GObject parent_instance;
GeglNode *node;
gpointer dynamic_id;
gpointer context_id;
GeglRectangle need_rect;
GeglRectangle result_rect;
......
......@@ -1338,13 +1338,13 @@ gegl_node_get_have_rect (GeglNode *node)
void
gegl_node_set_need_rect (GeglNode *node,
gpointer dynamic_id,
gpointer context_id,
gint x,
gint y,
gint width,
gint height)
{
GeglNodeDynamic *dynamic = gegl_node_get_dynamic (node, dynamic_id);
GeglNodeDynamic *dynamic = gegl_node_get_dynamic (node, context_id);
g_assert (node);
dynamic->need_rect.x = x;
dynamic->need_rect.y = y;
......@@ -1354,21 +1354,21 @@ gegl_node_set_need_rect (GeglNode *node,
GeglRectangle *
gegl_node_get_result_rect (GeglNode *node,
gpointer dynamic_id)
gpointer context_id)
{
GeglNodeDynamic *dynamic = gegl_node_get_dynamic (node, dynamic_id);
GeglNodeDynamic *dynamic = gegl_node_get_dynamic (node, context_id);
return &dynamic->result_rect;
}
void
gegl_node_set_result_rect (GeglNode *node,
gpointer dynamic_id,
gpointer context_id,
gint x,
gint y,
gint width,
gint height)
{
GeglNodeDynamic *dynamic = gegl_node_get_dynamic (node, dynamic_id);
GeglNodeDynamic *dynamic = gegl_node_get_dynamic (node, context_id);
g_assert (node);
g_assert (dynamic);
dynamic->result_rect.x = x;
......@@ -1379,9 +1379,9 @@ gegl_node_set_result_rect (GeglNode *node,
GeglRectangle *
gegl_node_get_need_rect (GeglNode *node,
gpointer dynamic_id)
gpointer context_id)
{
GeglNodeDynamic *dynamic = gegl_node_get_dynamic (node, dynamic_id);
GeglNodeDynamic *dynamic = gegl_node_get_dynamic (node, context_id);
return &dynamic->need_rect;
}
......@@ -1493,27 +1493,27 @@ gegl_node_process (GeglNode *self)
static gint
lookup_dynamic (gconstpointer a,
gconstpointer dynamic_id)
gconstpointer context_id)
{
GeglNodeDynamic *dynamic = (void*)a;
if (dynamic->dynamic_id == dynamic_id)
if (dynamic->context_id == context_id)
return 0;
return -1;
}
void babl_backtrack(void);
GeglNodeDynamic *
gegl_node_get_dynamic (GeglNode *self,
gpointer dynamic_id)
gpointer context_id)
{
GSList *found;
GeglNodeDynamic *dynamic = NULL;
found = g_slist_find_custom (self->dynamic, dynamic_id, lookup_dynamic);
found = g_slist_find_custom (self->dynamic, context_id, lookup_dynamic);
if (found)
dynamic = found->data;
else
{
g_warning ("didn't find %p", dynamic_id);
g_warning ("didn't find %p", context_id);
babl_backtrack();
}
return dynamic;
......@@ -1521,13 +1521,13 @@ gegl_node_get_dynamic (GeglNode *self,
void
gegl_node_remove_dynamic (GeglNode *self,
gpointer dynamic_id)
gpointer context_id)
{
GeglNodeDynamic *dynamic;
dynamic = gegl_node_get_dynamic (self, dynamic_id);
dynamic = gegl_node_get_dynamic (self, context_id);
if (!dynamic)
{
g_warning ("didn't find dynamic %p for %s", dynamic_id, gegl_node_get_debug_name (self));
g_warning ("didn't find dynamic %p for %s", context_id, gegl_node_get_debug_name (self));
return;
}
self->dynamic = g_slist_remove (self->dynamic, dynamic);
......@@ -1536,10 +1536,10 @@ gegl_node_remove_dynamic (GeglNode *self,
GeglNodeDynamic *
gegl_node_add_dynamic (GeglNode *self,
gpointer dynamic_id)
gpointer context_id)
{
GeglNodeDynamic *dynamic = NULL;
GSList *found = g_slist_find_custom (self->dynamic, dynamic_id, lookup_dynamic);
GSList *found = g_slist_find_custom (self->dynamic, context_id, lookup_dynamic);
if (found)
dynamic = found->data;
......@@ -1552,7 +1552,7 @@ gegl_node_add_dynamic (GeglNode *self,
dynamic = g_object_new (GEGL_TYPE_NODE_DYNAMIC, NULL);
dynamic->node = self;
dynamic->dynamic_id = dynamic_id;
dynamic->context_id = context_id;
self->dynamic = g_slist_append (self->dynamic, dynamic);
return dynamic;
}
......
......@@ -111,11 +111,11 @@ void gegl_node_get (GeglNode *self,
GType gegl_node_get_type (void) G_GNUC_CONST;
GeglNodeDynamic *gegl_node_get_dynamic (GeglNode *self,
gpointer dynamic_id);
gpointer context_id);
void gegl_node_remove_dynamic (GeglNode *self,
gpointer dynamic_id);
gpointer context_id);
GeglNodeDynamic *gegl_node_add_dynamic (GeglNode *self,
gpointer dynamic_id);
gpointer context_id);
void gegl_node_add_pad (GeglNode *self,
GeglPad *pad);
......@@ -168,16 +168,16 @@ void gegl_node_set_have_rect (GeglNode *node,
gint width,
gint height);
GeglRectangle * gegl_node_get_need_rect (GeglNode *node,
gpointer dynamic_id);
gpointer context_id);
void gegl_node_set_need_rect (GeglNode *node,
gpointer dynamic_id,
gpointer context_id,
gint x,
gint y,
gint width,
gint height);
void gegl_node_set_result_rect (GeglNode *node,
gpointer dynamic_id,
gpointer context_id,
gint x,
gint y,
gint width,
......
......@@ -43,13 +43,13 @@ static void set_property (GObject *gobject,
const GValue *value,
GParamSpec *pspec);
static gboolean process (GeglOperation *operation,
gpointer dynamic_id,
gpointer context_id,
const gchar *output_prop);
static void attach (GeglOperation *operation);
static GeglRectangle get_defined_region (GeglOperation *self);
static gboolean calc_source_regions (GeglOperation *self,
gpointer dynamic_id);
gpointer context_id);
G_DEFINE_TYPE (GeglOperationComposer, gegl_operation_composer, GEGL_TYPE_OPERATION)
......@@ -135,7 +135,7 @@ set_property (GObject *object,
static gboolean
process (GeglOperation *operation,
gpointer dynamic_id,
gpointer context_id,
const gchar *output_prop)
{
GeglBuffer *input;
......@@ -150,8 +150,8 @@ process (GeglOperation *operation,
return FALSE;
}
input = GEGL_BUFFER (gegl_operation_get_data (operation, dynamic_id, "input"));
aux = GEGL_BUFFER (gegl_operation_get_data (operation, dynamic_id, "aux"));
input = GEGL_BUFFER (gegl_operation_get_data (operation, context_id, "input"));
aux = GEGL_BUFFER (gegl_operation_get_data (operation, context_id, "aux"));
/* A composer with a NULL aux, can still be valid, the
* subclass has to handle it.
......@@ -159,7 +159,7 @@ process (GeglOperation *operation,
if (input != NULL ||
aux != NULL)
{
success = klass->process (operation, dynamic_id);
success = klass->process (operation, context_id);
}
else
{
......@@ -191,12 +191,12 @@ get_defined_region (GeglOperation *self)
static gboolean
calc_source_regions (GeglOperation *self,
gpointer dynamic_id)
gpointer context_id)
{
GeglRectangle *need_rect = gegl_operation_get_requested_region (self, dynamic_id);
GeglRectangle *need_rect = gegl_operation_get_requested_region (self, context_id);
gegl_operation_set_source_region (self, dynamic_id, "input", need_rect);
gegl_operation_set_source_region (self, dynamic_id, "aux", need_rect);
gegl_operation_set_source_region (self, context_id, "input", need_rect);
gegl_operation_set_source_region (self, context_id, "aux", need_rect);
return TRUE;
}
......@@ -46,7 +46,7 @@ struct _GeglOperationComposerClass
{
GeglOperationClass operation_class;
gboolean (*process) (GeglOperation *self,
gpointer dynamic_id);
gpointer context_id);
};
GType gegl_operation_composer_get_type (void) G_GNUC_CONST;
......
......@@ -39,14 +39,14 @@ static void set_property (GObject *gobject,
GParamSpec *pspec);
static gboolean process (GeglOperation *operation,
gpointer dynamic_id,
gpointer context_id,
const gchar *output_prop);
static void attach (GeglOperation *operation);
static GeglRectangle get_defined_region (GeglOperation *self);
static gboolean calc_source_regions (GeglOperation *self,
gpointer dynamic_id);
gpointer context_id);
G_DEFINE_TYPE (GeglOperationFilter, gegl_operation_filter, GEGL_TYPE_OPERATION)
......@@ -146,7 +146,7 @@ set_property (GObject *object,
static gboolean
process (GeglOperation *operation,
gpointer dynamic_id,
gpointer context_id,
const gchar *output_prop)
{
GeglOperationFilter *gegl_operation_filter;
......@@ -165,10 +165,10 @@ process (GeglOperation *operation,
return FALSE;
}
input = GEGL_BUFFER (gegl_operation_get_data (operation, dynamic_id, "input"));
input = GEGL_BUFFER (gegl_operation_get_data (operation, context_id, "input"));
if (input != NULL)
{
success = klass->process (operation, dynamic_id);
success = klass->process (operation, context_id);
}
else
{
......@@ -199,10 +199,10 @@ get_defined_region (GeglOperation *self)
static gboolean
calc_source_regions (GeglOperation *self,
gpointer dynamic_id)
gpointer context_id)
{
GeglRectangle *need_rect = gegl_operation_get_requested_region (self, dynamic_id);
GeglRectangle *need_rect = gegl_operation_get_requested_region (self, context_id);
gegl_operation_set_source_region (self, dynamic_id, "input", need_rect);
gegl_operation_set_source_region (self, context_id, "input", need_rect);
return TRUE;
}
......@@ -46,7 +46,7 @@ struct _GeglOperationFilterClass
{
GeglOperationClass operation_class;
gboolean (*process) (GeglOperation *self,
gpointer dynamic_id);
gpointer context_id);
};
GType gegl_operation_filter_get_type (void) G_GNUC_CONST;
......
......@@ -21,7 +21,7 @@
#include <string.h>
static gboolean process_inner (GeglOperation *operation,
gpointer dynamic_id);
gpointer context_id);
G_DEFINE_TYPE (GeglOperationPointComposer, gegl_operation_point_composer, GEGL_TYPE_OPERATION_COMPOSER)
......@@ -46,20 +46,20 @@ gegl_operation_point_composer_init (GeglOperationPointComposer *self)
static gboolean
process_inner (GeglOperation *operation,
gpointer dynamic_id)
gpointer context_id)
{
GeglOperationPointComposer *point_composer = GEGL_OPERATION_POINT_COMPOSER (operation);
GeglBuffer * input = GEGL_BUFFER (gegl_operation_get_data (operation, dynamic_id, "input"));
GeglBuffer * aux = GEGL_BUFFER (gegl_operation_get_data (operation, dynamic_id, "aux"));
GeglBuffer * input = GEGL_BUFFER (gegl_operation_get_data (operation, context_id, "input"));
GeglBuffer * aux = GEGL_BUFFER (gegl_operation_get_data (operation, context_id, "aux"));
GeglRectangle *result = gegl_operation_result_rect (operation, dynamic_id);
GeglRectangle *result = gegl_operation_result_rect (operation, context_id);
GeglBuffer *output;
if (!input && aux)
{
g_object_ref (aux);
gegl_operation_set_data (operation, dynamic_id, "output", G_OBJECT (aux));
gegl_operation_set_data (operation, context_id, "output", G_OBJECT (aux));
return TRUE;
}
......@@ -105,7 +105,7 @@ process_inner (GeglOperation *operation,
g_free (aux_buf);
}
gegl_operation_set_data (operation, dynamic_id, "output", G_OBJECT (output));
gegl_operation_set_data (operation, context_id, "output", G_OBJECT (output));
}
return TRUE;
}
......@@ -21,7 +21,7 @@
#include <string.h>
static gboolean process_inner (GeglOperation *operation,
gpointer dynamic_id);
gpointer context_id);
G_DEFINE_TYPE (GeglOperationPointFilter, gegl_operation_point_filter, GEGL_TYPE_OPERATION_FILTER)
......@@ -42,12 +42,12 @@ gegl_operation_point_filter_init (GeglOperationPointFilter *self)
static gboolean
process_inner (GeglOperation *operation,
gpointer dynamic_id)
gpointer context_id)
{
GeglOperationPointFilter *point_filter = GEGL_OPERATION_POINT_FILTER (operation);
GeglBuffer *input = GEGL_BUFFER (gegl_operation_get_data (operation, dynamic_id, "input"));
GeglRectangle *result = gegl_operation_result_rect (operation, dynamic_id);
GeglBuffer *input = GEGL_BUFFER (gegl_operation_get_data (operation, context_id, "input"));
GeglRectangle *result = gegl_operation_result_rect (operation, context_id);
GeglBuffer *output;
......@@ -80,7 +80,7 @@ process_inner (GeglOperation *operation,
g_free (buf);
}
gegl_operation_set_data (operation, dynamic_id, "output", G_OBJECT (output));
gegl_operation_set_data (operation, context_id, "output", G_OBJECT (output));
}
return TRUE;
}
......@@ -38,14 +38,14 @@ static void set_property (GObject *gobject,
GParamSpec *pspec);
static gboolean process (GeglOperation *operation,
gpointer dynamic_id,
gpointer context_id,
const gchar *output_prop);
static void attach (GeglOperation *operation);
static GeglRectangle get_defined_region (GeglOperation *self);
static gboolean calc_source_regions (GeglOperation *self,
gpointer dynamic_id);
gpointer context_id);
G_DEFINE_TYPE (GeglOperationSink, gegl_operation_sink, GEGL_TYPE_OPERATION)
......@@ -109,7 +109,7 @@ set_property (GObject *object,
static gboolean
process (GeglOperation *operation,
gpointer dynamic_id,
gpointer context_id,
const gchar *output_prop)
{
GeglOperationSink *gegl_operation_sink;
......@@ -122,10 +122,10 @@ process (GeglOperation *operation,
g_assert (klass->process);
input = GEGL_BUFFER (gegl_operation_get_data (operation, dynamic_id, "input"));
input = GEGL_BUFFER (gegl_operation_get_data (operation, context_id, "input"));
if (input);
{
success = klass->process (operation, dynamic_id);
success = klass->process (operation, context_id);
}
return success;
}
......@@ -147,10 +147,10 @@ get_defined_region (GeglOperation *self)
static gboolean
calc_source_regions (GeglOperation *self,
gpointer dynamic_id)
gpointer context_id)
{
GeglRectangle *need_rect = gegl_operation_get_requested_region (self, dynamic_id);
GeglRectangle *need_rect = gegl_operation_get_requested_region (self, context_id);
gegl_operation_set_source_region (self, dynamic_id, "input", need_rect);
gegl_operation_set_source_region (self, context_id, "input", need_rect);
return TRUE;
}
......@@ -46,7 +46,7 @@ struct _GeglOperationSinkClass
{
GeglOperationClass operation_class;
gboolean (*process) (GeglOperation *self,
gpointer dynamic_id);
gpointer context_id);
};
GType gegl_operation_sink_get_type (void) G_GNUC_CONST;
......
......@@ -36,7 +36,7 @@ static void set_property (GObject *gobject,
const GValue *value,
GParamSpec *pspec);
static gboolean process (GeglOperation *operation,
gpointer dynamic_id,
gpointer context_id,
const gchar *output_prop);
static void attach (GeglOperation *operation);
......@@ -46,7 +46,7 @@ G_DEFINE_TYPE (GeglOperationSource, gegl_operation_source, GEGL_TYPE_OPERATION)
static GeglRectangle get_defined_region (GeglOperation *self);
static gboolean calc_source_regions (GeglOperation *self,
gpointer dynamic_id);
gpointer context_id);
static void
gegl_operation_source_class_init (GeglOperationSourceClass * klass)
......@@ -107,7 +107,7 @@ set_property (GObject *object,
static gboolean