gegl r2938 - trunk/operations/common

[martinn svn gnome org]

Author: martinn
Date: Sun Feb 22 18:54:02 2009
New Revision: 2938
URL: http://svn.gnome.org/viewvc/gegl?rev=2938&view=rev

Log:
Always set "output" in gegl:introspect process()

Always set "output" in gegl:introspect process() so that multi-pass
processing doesn't b0rk.

Modified:
   trunk/operations/common/introspect.c

Modified: trunk/operations/common/introspect.c
==============================================================================
--- trunk/operations/common/introspect.c	(original)
+++ trunk/operations/common/introspect.c	Sun Feb 22 18:54:02 2009
@@ -98,6 +98,20 @@
   g_free (xml);
 }
 
+static void
+gegl_introspect_dispose (GObject *object)
+{
+  GeglChantO *o = GEGL_CHANT_PROPERTIES (object);
+
+  if (o->chant_data != NULL)
+    {
+      g_object_unref (o->chant_data);
+      o->chant_data = NULL;
+    }
+
+  G_OBJECT_CLASS (gegl_chant_parent_class)->dispose (object);
+}
+
 static GeglRectangle
 gegl_introspect_get_bounding_box (GeglOperation *operation)
 {
@@ -124,13 +138,14 @@
 {
   GeglChantO *o = GEGL_CHANT_PROPERTIES (operation);
 
-  if (!o->chant_data)
-    return FALSE;
+  gegl_introspect_load_cache (o);
+
+  /* gegl_operation_context_set_object() takes the reference we have,
+   * so we must increase it since we want to keep the object
+   */
+  g_object_ref (o->chant_data);
 
-  /* overriding the predefined behavior */
   gegl_operation_context_set_object (context, output_pad, G_OBJECT (o->chant_data));
-  g_object_unref (o->chant_data);
-  o->chant_data = NULL;
 
   return  TRUE;
 }
@@ -138,12 +153,16 @@
 static void
 gegl_chant_class_init (GeglChantClass *klass)
 {
+  GObjectClass             *object_class;
   GeglOperationClass       *operation_class;
   GeglOperationSourceClass *source_class;
 
+  object_class    = G_OBJECT_CLASS (klass);
   operation_class = GEGL_OPERATION_CLASS (klass);
   source_class    = GEGL_OPERATION_SOURCE_CLASS (klass);
 
+  object_class->dispose             = gegl_introspect_dispose;
+
   operation_class->process          = gegl_introspect_process;
   operation_class->get_bounding_box = gegl_introspect_get_bounding_box;