gnomemm r1520 - in geglmm/trunk: . libgegl/src

[hub svn gnome org]

Author: hub
Date: Thu May 22 01:16:06 2008
New Revision: 1520
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1520&view=rev

Log:
	* libgegl/src/nodecontext.ccg:
	* libgegl/src/nodecontext.hg:
	* libgegl/src/Makefile_list_of_hg.am_fragment:
	* libgegl/src/operation.hg: Fix a crash as GeglNodeContext is 
	still opaque.


Modified:
   geglmm/trunk/ChangeLog
   geglmm/trunk/libgegl/src/Makefile_list_of_hg.am_fragment
   geglmm/trunk/libgegl/src/nodecontext.ccg
   geglmm/trunk/libgegl/src/nodecontext.hg
   geglmm/trunk/libgegl/src/operation.hg

Modified: geglmm/trunk/libgegl/src/Makefile_list_of_hg.am_fragment
==============================================================================
--- geglmm/trunk/libgegl/src/Makefile_list_of_hg.am_fragment	(original)
+++ geglmm/trunk/libgegl/src/Makefile_list_of_hg.am_fragment	Thu May 22 01:16:06 2008
@@ -3,7 +3,7 @@
 # so it's like copy-and-pasting this into each of those Makefile.am files.
 
 files_hg =  rectangle.hg node.hg processor.hg buffer.hg curve.hg color.hg\
-	operation.hg nodecontext.hg
+	operation.hg
 
 
 

Modified: geglmm/trunk/libgegl/src/nodecontext.ccg
==============================================================================
--- geglmm/trunk/libgegl/src/nodecontext.ccg	(original)
+++ geglmm/trunk/libgegl/src/nodecontext.ccg	Thu May 22 01:16:06 2008
@@ -17,3 +17,6 @@
  */
 
 
+// gegl-plugin seems to include config.h. BAD.
+#undef HAVE_CONFIG_H
+#include <gegl-plugin.h>

Modified: geglmm/trunk/libgegl/src/nodecontext.hg
==============================================================================
--- geglmm/trunk/libgegl/src/nodecontext.hg	(original)
+++ geglmm/trunk/libgegl/src/nodecontext.hg	Thu May 22 01:16:06 2008
@@ -22,17 +22,14 @@
 _DEFS(libgeglmm,libgegl)
 _PINCLUDE(glibmm/private/object_p.h)
 
-// gegl-plugin seems to include config.h. BAD.
-#undef HAVE_CONFIG_H
-#include <gegl-plugin.h>
 
 namespace Gegl
 {
 
 class NodeContext
-	: public Glib::Object
+//	: public Glib::Object
 {
-	_CLASS_GOBJECT(NodeContext, GeglNodeContext, GEGL_NODE, Glib::Object, GObject)
+//	_CLASS_GOBJECT(NodeContext, GeglNodeContext, GEGL_NODE_CONTEXT, Glib::Object, GObject)
 public:
 	//	_WRAP_METHOD(Glib::RefPtr<Buffer> get_source(const Glib::ustring & padname), gegl_node_context_get_source)
 	//	_WRAP_METHOD(Glib::RefPtr<Buffer> get_target(const Glib::ustring & padname), gegl_node_context_get_target)

Modified: geglmm/trunk/libgegl/src/operation.hg
==============================================================================
--- geglmm/trunk/libgegl/src/operation.hg	(original)
+++ geglmm/trunk/libgegl/src/operation.hg	Thu May 22 01:16:06 2008
@@ -48,7 +48,7 @@
 	_WRAP_METHOD(Glib::RefPtr<const Node> detect(int x, int y) const, gegl_operation_detect, refreturn, constversion)
 	_WRAP_METHOD(void attach(const Glib::RefPtr<Node> & node), gegl_operation_attach)
 	_WRAP_METHOD(void prepare(), gegl_operation_prepare)
-	_WRAP_METHOD(bool process(const Glib::RefPtr<NodeContext> & context, const Glib::ustring & output_pad, const Rectangle & result_rect), gegl_operation_process)
+	_WRAP_METHOD(bool process(GeglNodeContext * context, const Glib::ustring & output_pad, const Rectangle & result_rect), gegl_operation_process)
 	_WRAP_METHOD(void create_pad(GParamSpec *param_spec), gegl_operation_create_pad)
 	_WRAP_METHOD(void set_format(const Glib::ustring & pad_name, const Babl *format), gegl_operation_set_format)
 	_WRAP_METHOD(const Babl* get_format(const Glib::ustring & pad_name), gegl_operation_get_format) //TODO: Wrap Babl.