GNOME.org
 

gnomemm r1985 - in geglmm/trunk: . examples gegl/src tools/extra_defs_gen

Author: hub
Date: Sat Jan 10 16:50:34 2009
New Revision: 1985
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1985&view=rev

Log:
	* configure.in
	* tools/extra_defs_gen/generate_defs_gegl.cc
	* gegl/src/gegl_methods.defs
	* gegl/src/gegl_signals.defs
	* gegl/src/node.hg
	* gegl/src/Makefile.am
	* examples/geglbuffer-add-image.cc
	* examples/geglbuffer-clock.cc
	* examples/hello-world.cc
	* examples/2geglbuffer.cc
	* NEWS:
	Update to gegl 0.0.22. Require gegl 0.0.22
	Add Gegl::Node::add_child() and Gegl::Node::remove_child()
	Change the operation names (gegl change).



Modified:
   geglmm/trunk/ChangeLog
   geglmm/trunk/NEWS
   geglmm/trunk/configure.in
   geglmm/trunk/examples/2geglbuffer.cc
   geglmm/trunk/examples/geglbuffer-add-image.cc
   geglmm/trunk/examples/geglbuffer-clock.cc
   geglmm/trunk/examples/hello-world.cc
   geglmm/trunk/gegl/src/Makefile.am
   geglmm/trunk/gegl/src/gegl_methods.defs
   geglmm/trunk/gegl/src/gegl_signals.defs
   geglmm/trunk/gegl/src/node.hg
   geglmm/trunk/tools/extra_defs_gen/generate_defs_gegl.cc

Modified: geglmm/trunk/NEWS
==============================================================================
--- geglmm/trunk/NEWS	(original)
+++ geglmm/trunk/NEWS	Sat Jan 10 16:50:34 2009
@@ -1,9 +1,13 @@
-0.0.18
- - NEW: Bump gegl to 0.0.20
+0.0.22
+ - NEW: Bump gegl to 0.0.22
+ - NEW: New major soversion (ABI breakage in gegl)
  - NEW: Gegl::Buffer::destroy()
  - NEW: Gegl::Buffer::linear_open()
  - NEW: Gegl::Buffer::linear_close()
+ - NEW: Gegl::Node::add_child()
+ - NEW: Gegl::Node::remove_child()
  - BUG: configure didn't enforce a gegl recent enough.
+ - API: use the new operation names for gegl (ABI break)
 
 0.0.17.1
 

Modified: geglmm/trunk/configure.in
==============================================================================
--- geglmm/trunk/configure.in	(original)
+++ geglmm/trunk/configure.in	Sat Jan 10 16:50:34 2009
@@ -18,7 +18,7 @@
 #We use pushdef here because we can't use shell variables before AC_INIT, but we want to use a variable with AC_INIT:
 pushdef([LIBGEGLMM_MAJOR_VERSION],     [0])
 pushdef([LIBGEGLMM_MINOR_VERSION],     [0])
-pushdef([LIBGEGLMM_MICRO_VERSION],     [18])
+pushdef([LIBGEGLMM_MICRO_VERSION],     [22])
 pushdef([LIBGEGLMM_EXTRA_VERSION],     [])
 pushdef([LIBGEGLMM_VERSION], LIBGEGLMM_MAJOR_VERSION.LIBGEGLMM_MINOR_VERSION.LIBGEGLMM_MICRO_VERSION[]LIBGEGLMM_EXTRA_VERSION)
 AC_INIT([geglmm], LIBGEGLMM_VERSION, [gtkmm-list gnome org])
@@ -33,7 +33,7 @@
 #  ? :+1 : ?   == just some internal changes, nothing breaks but might work 
 #                 better
 # CURRENT : REVISION : AGE
-LIBGEGLMM_SO_VERSION=1:1:0
+LIBGEGLMM_SO_VERSION=2:1:0
 
 AC_SUBST([LIBGEGLMM_VERSION])
 AC_SUBST(LIBGEGLMM_RELEASE)
@@ -113,7 +113,7 @@
 #########################################################################
 #  Dependancy checks
 #########################################################################
-PKG_CHECK_MODULES(LIBGEGLMM, glibmm-2.4 >= 2.12.8 gegl >= 0.0.20)
+PKG_CHECK_MODULES(LIBGEGLMM, glibmm-2.4 >= 2.12.8 gegl >= 0.0.22)
 AC_SUBST(LIBGEGLMM_CFLAGS)
 AC_SUBST(LIBGEGLMM_LIBS)
 

Modified: geglmm/trunk/examples/2geglbuffer.cc
==============================================================================
--- geglmm/trunk/examples/2geglbuffer.cc	(original)
+++ geglmm/trunk/examples/2geglbuffer.cc	Sat Jan 10 16:50:34 2009
@@ -21,9 +21,9 @@
     }
 
   gegl = Gegl::Node::create();
-  load_file = gegl->new_child ( "operation", "load");
+  load_file = gegl->new_child ( "operation", "gegl:load");
   load_file->set("path", Glib::ustring(argv[1]));
-  save_file = gegl->new_child ( "operation", "save-buffer");
+  save_file = gegl->new_child ( "operation", "gegl:save-buffer");
   save_file->set("buffer", buffer);
 
   load_file->link (save_file);

Modified: geglmm/trunk/examples/geglbuffer-add-image.cc
==============================================================================
--- geglmm/trunk/examples/geglbuffer-add-image.cc	(original)
+++ geglmm/trunk/examples/geglbuffer-add-image.cc	Sat Jan 10 16:50:34 2009
@@ -37,11 +37,11 @@
   buffer = Gegl::Buffer::create_from_file (buf_file);
   gegl = Gegl::Node::create();
 
-  write_buffer = gegl->new_child ("operation", "write-buffer");
+  write_buffer = gegl->new_child ("operation", "gegl:write-buffer");
   write_buffer->set("buffer", buffer);
-  shift      = gegl->new_child ("operation", "shift");
+  shift      = gegl->new_child ("operation", "gegl:shift");
   shift->set ( "x", x).set("y", y);
-  load        = gegl->new_child ("operation", "load");
+  load        = gegl->new_child ("operation", "gegl:load");
   load->set ("path", Glib::ustring(in_file));
 
   load->link(shift)->link(write_buffer);

Modified: geglmm/trunk/examples/geglbuffer-clock.cc
==============================================================================
--- geglmm/trunk/examples/geglbuffer-clock.cc	(original)
+++ geglmm/trunk/examples/geglbuffer-clock.cc	Sat Jan 10 16:50:34 2009
@@ -30,25 +30,25 @@
   gegl = Gegl::Node::create ();
 
 
-  blank      = gegl->new_child ("operation", "color");
+  blank      = gegl->new_child ("operation", "gegl:color");
   blank->set ("value", Gegl::Color::create ("rgba(0.0,0.0,0.0,0.4)"));
 
-  crop       = gegl->new_child ("operation", "crop");
+  crop       = gegl->new_child ("operation", "gegl:crop");
   crop->set ("x", 0.0);
   crop->set ("y", 0.0);
   crop->set ("width", 260.0);
   crop->set ("height", 22.0);
 
-  layer      = gegl->new_child ("operation", "layer");
+  layer      = gegl->new_child ("operation", "gegl:layer");
 
-  shift      = gegl->new_child ("operation", "shift");
+  shift      = gegl->new_child ("operation", "gegl:shift");
   shift->set("x", 0.0);
   shift->set("y", 0.0);
 
-  text       = gegl->new_child ("operation", "text");
+  text       = gegl->new_child ("operation", "gegl:text");
   text->set ("size", 20.0);
                              /*      "color", gegl_color_new ("rgb(0.0,0.0,0.0)"),*/
-  display    = gegl->new_child ("operation", "composite-buffer");
+  display    = gegl->new_child ("operation", "gegl:composite-buffer");
   display->set ("path", Glib::ustring(argv[1]));
 
   blank->link(crop)->link(layer)->link(shift)->link(display);

Modified: geglmm/trunk/examples/hello-world.cc
==============================================================================
--- geglmm/trunk/examples/hello-world.cc	(original)
+++ geglmm/trunk/examples/hello-world.cc	Sat Jan 10 16:50:34 2009
@@ -37,13 +37,13 @@
 */
 
     /*< The image nodes representing operations we want to perform */
-    Glib::RefPtr<Gegl::Node> display = gegl->create_child("display");
-    Glib::RefPtr<Gegl::Node> layer = gegl->new_child("operation", "layer");
+    Glib::RefPtr<Gegl::Node> display = gegl->create_child("gegl:display");
+    Glib::RefPtr<Gegl::Node> layer = gegl->new_child("operation", "gegl:layer");
     layer->set ("x", 2.0).set ("y", 4.0);
-    Glib::RefPtr<Gegl::Node> text = gegl->new_child("operation", "text");
+    Glib::RefPtr<Gegl::Node> text = gegl->new_child("operation", "gegl:text");
     text->set ("size", 10.0)
 		.set ("color", Glib::RefPtr<Gegl::Color>(Gegl::Color::create ("rgb(1.0,1.0,1.0)")));
-    Glib::RefPtr<Gegl::Node> mandelbrot = gegl->new_child ("operation", "fractal-explorer");
+    Glib::RefPtr<Gegl::Node> mandelbrot = gegl->new_child ("operation", "gegl:fractal-explorer");
     mandelbrot->set ("width", 512).set ("height", 384);
 
     mandelbrot->link(layer)->link(display);

Modified: geglmm/trunk/gegl/src/Makefile.am
==============================================================================
--- geglmm/trunk/gegl/src/Makefile.am	(original)
+++ geglmm/trunk/gegl/src/Makefile.am	Sat Jan 10 16:50:34 2009
@@ -4,8 +4,10 @@
 sublib_name	= geglmm
 sublib_namespace = Gegl
 sublib_parentdir = geglmm
-files_defs	= gegl.defs gegl_methods.defs gegl_signals.defs\
-                  gegl_enums.defs gegl_docs.xml gegl_docs_override.xml
+files_defs	=gegl.defs gegl_methods.defs gegl_signals.defs\
+gegl_enums.defs\
+gegl_docs.xml\
+gegl_docs_override.xml
 
 include $(top_srcdir)/build_shared/Makefile_gensrc.am_fragment
 

Modified: geglmm/trunk/gegl/src/gegl_methods.defs
==============================================================================
--- geglmm/trunk/gegl/src/gegl_methods.defs	(original)
+++ geglmm/trunk/gegl/src/gegl_methods.defs	Sat Jan 10 16:50:34 2009
@@ -840,6 +840,24 @@
   )
 )
 
+(define-method add_child
+  (of-object "GeglNode")
+  (c-name "gegl_node_add_child")
+  (return-type "GeglNode*")
+  (parameters
+    '("GeglNode*" "child")
+  )
+)
+
+(define-method remove_child
+  (of-object "GeglNode")
+  (c-name "gegl_node_remove_child")
+  (return-type "GeglNode*")
+  (parameters
+    '("GeglNode*" "child")
+  )
+)
+
 (define-method get_parent
   (of-object "GeglNode")
   (c-name "gegl_node_get_parent")
@@ -1022,6 +1040,109 @@
 
 
 
+;; From gegl-matrix.h
+
+(define-method identity
+  (of-object "GeglMatrix3")
+  (c-name "gegl_matrix3_identity")
+  (return-type "none")
+)
+
+(define-method equal
+  (of-object "GeglMatrix3")
+  (c-name "gegl_matrix3_equal")
+  (return-type "gboolean")
+  (parameters
+    '("GeglMatrix3" "matrix2")
+  )
+)
+
+(define-method is_identity
+  (of-object "GeglMatrix3")
+  (c-name "gegl_matrix3_is_identity")
+  (return-type "gboolean")
+)
+
+(define-method is_scale
+  (of-object "GeglMatrix3")
+  (c-name "gegl_matrix3_is_scale")
+  (return-type "gboolean")
+)
+
+(define-method is_translate
+  (of-object "GeglMatrix3")
+  (c-name "gegl_matrix3_is_translate")
+  (return-type "gboolean")
+)
+
+(define-method copy
+  (of-object "GeglMatrix3")
+  (c-name "gegl_matrix3_copy")
+  (return-type "none")
+  (parameters
+    '("GeglMatrix3" "src")
+  )
+)
+
+(define-method determinant
+  (of-object "GeglMatrix3")
+  (c-name "gegl_matrix3_determinant")
+  (return-type "gdouble")
+)
+
+(define-method invert
+  (of-object "GeglMatrix3")
+  (c-name "gegl_matrix3_invert")
+  (return-type "none")
+)
+
+(define-method multiply
+  (of-object "GeglMatrix3")
+  (c-name "gegl_matrix3_multiply")
+  (return-type "none")
+  (parameters
+    '("GeglMatrix3" "right")
+    '("GeglMatrix3" "product")
+  )
+)
+
+(define-method originate
+  (of-object "GeglMatrix3")
+  (c-name "gegl_matrix3_originate")
+  (return-type "none")
+  (parameters
+    '("gdouble" "x")
+    '("gdouble" "y")
+  )
+)
+
+(define-method transform_point
+  (of-object "GeglMatrix3")
+  (c-name "gegl_matrix3_transform_point")
+  (return-type "none")
+  (parameters
+    '("gdouble*" "x")
+    '("gdouble*" "y")
+  )
+)
+
+(define-method parse_string
+  (of-object "GeglMatrix3")
+  (c-name "gegl_matrix3_parse_string")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "string")
+  )
+)
+
+(define-method to_string
+  (of-object "GeglMatrix3")
+  (c-name "gegl_matrix3_to_string")
+  (return-type "gchar*")
+)
+
+
+
 ;; From gegl-paramspecs.h
 
 (define-function gegl_int32_get_type
@@ -1115,13 +1236,13 @@
   )
 )
 
-(define-function gegl_param_path_get_type
-  (c-name "gegl_param_path_get_type")
+(define-function gegl_param_file_path_get_type
+  (c-name "gegl_param_file_path_get_type")
   (return-type "GType")
 )
 
-(define-function gegl_param_spec_path
-  (c-name "gegl_param_spec_path")
+(define-function gegl_param_spec_file_path
+  (c-name "gegl_param_spec_file_path")
   (return-type "GParamSpec*")
   (parameters
     '("const-gchar*" "name")
@@ -1180,6 +1301,344 @@
 
 
 
+;; From gegl-path.h
+
+(define-function gegl_path_get_type
+  (c-name "gegl_path_get_type")
+  (return-type "GType")
+)
+
+(define-function gegl_path_new
+  (c-name "gegl_path_new")
+  (is-constructor-of "GeglPath")
+  (return-type "GeglPath*")
+)
+
+(define-function gegl_path_new_from_string
+  (c-name "gegl_path_new_from_string")
+  (return-type "GeglPath*")
+  (parameters
+    '("const-gchar*" "path_string")
+  )
+)
+
+(define-method is_empty
+  (of-object "GeglPath")
+  (c-name "gegl_path_is_empty")
+  (return-type "gboolean")
+)
+
+(define-method get_n_nodes
+  (of-object "GeglPath")
+  (c-name "gegl_path_get_n_nodes")
+  (return-type "gint")
+)
+
+(define-method get_length
+  (of-object "GeglPath")
+  (c-name "gegl_path_get_length")
+  (return-type "gdouble")
+)
+
+(define-method get_node
+  (of-object "GeglPath")
+  (c-name "gegl_path_get_node")
+  (return-type "const-GeglPathItem*")
+  (parameters
+    '("gint" "pos")
+  )
+)
+
+(define-method to_string
+  (of-object "GeglPath")
+  (c-name "gegl_path_to_string")
+  (return-type "gchar*")
+)
+
+(define-method get_matrix
+  (of-object "GeglPath")
+  (c-name "gegl_path_get_matrix")
+  (return-type "none")
+  (parameters
+    '("GeglMatrix3" "matrix")
+  )
+)
+
+(define-method set_matrix
+  (of-object "GeglPath")
+  (c-name "gegl_path_set_matrix")
+  (return-type "none")
+  (parameters
+    '("GeglMatrix3" "matrix")
+  )
+)
+
+(define-method closest_point
+  (of-object "GeglPath")
+  (c-name "gegl_path_closest_point")
+  (return-type "gdouble")
+  (parameters
+    '("gdouble" "x")
+    '("gdouble" "y")
+    '("gdouble*" "dx")
+    '("gdouble*" "dy")
+    '("gint*" "node_pos_before")
+  )
+)
+
+(define-method calc
+  (of-object "GeglPath")
+  (c-name "gegl_path_calc")
+  (return-type "none")
+  (parameters
+    '("gdouble" "pos")
+    '("gdouble*" "dest_x")
+    '("gdouble*" "dest_y")
+  )
+)
+
+(define-method calc_values
+  (of-object "GeglPath")
+  (c-name "gegl_path_calc_values")
+  (return-type "none")
+  (parameters
+    '("guint" "num_samples")
+    '("gdouble*" "dest_xs")
+    '("gdouble*" "dest_ys")
+  )
+)
+
+(define-method get_bounds
+  (of-object "GeglPath")
+  (c-name "gegl_path_get_bounds")
+  (return-type "none")
+  (parameters
+    '("gdouble*" "min_x")
+    '("gdouble*" "max_x")
+    '("gdouble*" "min_y")
+    '("gdouble*" "max_y")
+  )
+)
+
+(define-method foreach
+  (of-object "GeglPath")
+  (c-name "gegl_path_foreach")
+  (return-type "none")
+  (parameters
+    '("foreach_fun_t" "each_item")
+  )
+)
+
+(define-method foreach_flat
+  (of-object "GeglPath")
+  (c-name "gegl_path_foreach_flat")
+  (return-type "none")
+  (parameters
+    '("foreach_fun_t" "each_item")
+  )
+)
+
+(define-method clear
+  (of-object "GeglPath")
+  (c-name "gegl_path_clear")
+  (return-type "none")
+)
+
+(define-method insert_node
+  (of-object "GeglPath")
+  (c-name "gegl_path_insert_node")
+  (return-type "none")
+  (parameters
+    '("gint" "pos")
+    '("const-GeglPathItem*" "knot")
+  )
+)
+
+(define-method replace_node
+  (of-object "GeglPath")
+  (c-name "gegl_path_replace_node")
+  (return-type "none")
+  (parameters
+    '("gint" "pos")
+    '("const-GeglPathItem*" "knot")
+  )
+)
+
+(define-method remove_node
+  (of-object "GeglPath")
+  (c-name "gegl_path_remove_node")
+  (return-type "none")
+  (parameters
+    '("gint" "pos")
+  )
+)
+
+(define-method parse_string
+  (of-object "GeglPath")
+  (c-name "gegl_path_parse_string")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "path_string")
+  )
+)
+
+(define-method append
+  (of-object "GeglPath")
+  (c-name "gegl_path_append")
+  (return-type "none")
+  (parameters
+  )
+  (varargs #t)
+)
+
+(define-method add_parameter_path
+  (of-object "GeglPath")
+  (c-name "gegl_path_add_parameter_path")
+  (return-type "GeglPath*")
+  (parameters
+    '("const-gchar*" "parameter_name")
+  )
+)
+
+(define-method get_parameter_path
+  (of-object "GeglPath")
+  (c-name "gegl_path_get_parameter_path")
+  (return-type "GeglPath*")
+  (parameters
+    '("const-gchar*" "parameter_name")
+  )
+)
+
+(define-method parameter_get_names
+  (of-object "GeglPath")
+  (c-name "gegl_path_parameter_get_names")
+  (return-type "GSList*")
+  (parameters
+    '("gint*" "count")
+  )
+)
+
+(define-method parameter_calc
+  (of-object "GeglPath")
+  (c-name "gegl_path_parameter_calc")
+  (return-type "gdouble")
+  (parameters
+    '("const-gchar*" "parameter_name")
+    '("gdouble" "pos")
+  )
+)
+
+(define-method parameter_get_bounds
+  (of-object "GeglPath")
+  (c-name "gegl_path_parameter_get_bounds")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "parameter_name")
+    '("gdouble*" "min_value")
+    '("gdouble*" "max_value")
+  )
+)
+
+(define-method parameter_calc_values
+  (of-object "GeglPath")
+  (c-name "gegl_path_parameter_calc_values")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "parameter_name")
+    '("guint" "num_samples")
+    '("gdouble*" "samples")
+  )
+)
+
+(define-function gegl_param_spec_path
+  (c-name "gegl_param_spec_path")
+  (return-type "GParamSpec*")
+  (parameters
+    '("const-gchar*" "name")
+    '("const-gchar*" "nick")
+    '("const-gchar*" "blurb")
+    '("GeglPath*" "default_path")
+    '("GParamFlags" "flags")
+  )
+)
+
+(define-function gegl_param_path_get_type
+  (c-name "gegl_param_path_get_type")
+  (return-type "GType")
+)
+
+(define-method append
+  (of-object "GeglPathList")
+  (c-name "gegl_path_list_append")
+  (return-type "GeglPathList*")
+  (parameters
+  )
+  (varargs #t)
+)
+
+(define-method destroy
+  (of-object "GeglPathList")
+  (c-name "gegl_path_list_destroy")
+  (return-type "GeglPathList*")
+)
+
+(define-function gegl_path_add_type
+  (c-name "gegl_path_add_type")
+  (return-type "none")
+  (parameters
+    '("gchar" "type")
+    '("gint" "pairs")
+    '("const-gchar*" "description")
+  )
+)
+
+(define-function gegl_path_add_flattener
+  (c-name "gegl_path_add_flattener")
+  (return-type "none")
+  (parameters
+    '("flattner_func_t" "func")
+  )
+)
+
+(define-function gegl_path_fill
+  (c-name "gegl_path_fill")
+  (return-type "none")
+  (parameters
+    '("GeglBuffer*" "buffer")
+    '("GeglPath*" "path")
+    '("GeglColor*" "color")
+    '("gboolean" "winding")
+  )
+)
+
+(define-function gegl_path_stroke
+  (c-name "gegl_path_stroke")
+  (return-type "none")
+  (parameters
+    '("GeglBuffer*" "buffer")
+    '("const-GeglRectangle*" "clip_rect")
+    '("GeglPath*" "vector")
+    '("GeglColor*" "color")
+    '("gdouble" "linewidth")
+    '("gdouble" "hardness")
+    '("gdouble" "opacity")
+  )
+)
+
+(define-method freeze
+  (of-object "GeglPath")
+  (c-name "gegl_path_freeze")
+  (return-type "none")
+)
+
+(define-method thaw
+  (of-object "GeglPath")
+  (c-name "gegl_path_thaw")
+  (return-type "none")
+)
+
+
+
 ;; From gegl-plugin.h
 
 (define-function gegl_module_register_type
@@ -1529,11 +1988,11 @@
   )
 )
 
-(define-function gegl_operation_vector_prop_changed
-  (c-name "gegl_operation_vector_prop_changed")
+(define-function gegl_operation_path_prop_changed
+  (c-name "gegl_operation_path_prop_changed")
   (return-type "none")
   (parameters
-    '("GeglVector*" "vector")
+    '("GeglPath*" "path")
     '("GeglOperation*" "operation")
   )
 )
@@ -1544,6 +2003,7 @@
   (return-type "none")
   (parameters
     '("const-GeglRectangle*" "roi")
+    '("gboolean" "clear_cache")
   )
 )
 

Modified: geglmm/trunk/gegl/src/gegl_signals.defs
==============================================================================
--- geglmm/trunk/gegl/src/gegl_signals.defs	(original)
+++ geglmm/trunk/gegl/src/gegl_signals.defs	Sat Jan 10 16:50:34 2009
@@ -275,6 +275,37 @@
   (construct-only #f)
 )
 
+;; From GeglPath
+
+(define-signal changed
+  (of-object "GeglPath")
+  (return-type "void")
+  (when "last")
+  (parameters
+    '("gpointer" "p0")
+  )
+)
+
+;; From GeglInt32
+
+;; From GeglParamInt32
+
+;; From GeglInt16
+
+;; From GeglParamInt16
+
+;; From GeglInt8
+
+;; From GeglParamInt8
+
+;; From GeglParamString
+
+;; From GeglParamPath
+
+;; From GeglParamMultiline
+
+;; From GeglParamEnum
+
 ;; From GeglOperation
 
 ;; From GeglOperationSource
@@ -348,6 +379,44 @@
   (construct-only #f)
 )
 
+;; From GeglOperationComposer3
+
+(define-property output
+  (of-object "GeglOperationComposer3")
+  (prop-type "GParamObject")
+  (docs "Ouput pad for generated image buffer.")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property input
+  (of-object "GeglOperationComposer3")
+  (prop-type "GParamObject")
+  (docs "Input pad, for image buffer input.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property aux
+  (of-object "GeglOperationComposer3")
+  (prop-type "GParamObject")
+  (docs "Auxiliary image buffer input pad.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property aux2
+  (of-object "GeglOperationComposer3")
+  (prop-type "GParamObject")
+  (docs "Second auxiliary image buffer input pad.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 ;; From GeglOperationPointComposer
 
 (define-property output
@@ -377,6 +446,44 @@
   (construct-only #f)
 )
 
+;; From GeglOperationPointComposer3
+
+(define-property output
+  (of-object "GeglOperationPointComposer3")
+  (prop-type "GParamObject")
+  (docs "Ouput pad for generated image buffer.")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property input
+  (of-object "GeglOperationPointComposer3")
+  (prop-type "GParamObject")
+  (docs "Input pad, for image buffer input.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property aux
+  (of-object "GeglOperationPointComposer3")
+  (prop-type "GParamObject")
+  (docs "Auxiliary image buffer input pad.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property aux2
+  (of-object "GeglOperationPointComposer3")
+  (prop-type "GParamObject")
+  (docs "Second auxiliary image buffer input pad.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 ;; From GeglOperationPointFilter
 
 (define-property output

Modified: geglmm/trunk/gegl/src/node.hg
==============================================================================
--- geglmm/trunk/gegl/src/node.hg	(original)
+++ geglmm/trunk/gegl/src/node.hg	Sat Jan 10 16:50:34 2009
@@ -71,6 +71,9 @@
 	// not sure.
 	_WRAP_METHOD(Glib::RefPtr<Node> adopt_child(const Glib::RefPtr<Node> & child), gegl_node_adopt_child)
 
+    _WRAP_METHOD(Glib::RefPtr<Node> add_child(const Glib::RefPtr<Node> & child), gegl_node_add_child)
+    _WRAP_METHOD(Glib::RefPtr<Node> remove_child(const Glib::RefPtr<Node> & child), gegl_node_remove_child)
+
 	_WRAP_METHOD(Glib::RefPtr<Node> get_parent(), gegl_node_get_parent, refreturn)
 	_WRAP_METHOD(Glib::RefPtr<const Node> get_parent() const, gegl_node_get_parent, refreturn, constversion)
 

Modified: geglmm/trunk/tools/extra_defs_gen/generate_defs_gegl.cc
==============================================================================
--- geglmm/trunk/tools/extra_defs_gen/generate_defs_gegl.cc	(original)
+++ geglmm/trunk/tools/extra_defs_gen/generate_defs_gegl.cc	Sat Jan 10 16:50:34 2009
@@ -21,10 +21,6 @@
 
 #include <iostream>
 #include "glibmm_generate_extra_defs/generate_extra_defs.h"
-// remove when gegl 0.0.22 is released.
-extern "C" {
-#include <gegl-paramspecs.h>
-}
 #include <gegl.h>
 #undef HAVE_CONFIG_H
 #include <gegl-plugin.h>
@@ -41,6 +37,7 @@
 			  << get_defs(GEGL_TYPE_CURVE)
 			  << get_defs(GEGL_TYPE_PARAM_CURVE)
 			  << get_defs(GEGL_TYPE_PROCESSOR)
+			  << get_defs(GEGL_TYPE_PATH)
 			  << get_defs(GEGL_TYPE_INT32)
 			  << get_defs(GEGL_TYPE_PARAM_INT32)
 			  << get_defs(GEGL_TYPE_INT16)
@@ -56,7 +53,9 @@
 			  << get_defs(GEGL_TYPE_OPERATION_SINK)
 			  << get_defs(GEGL_TYPE_OPERATION_FILTER)
 			  << get_defs(GEGL_TYPE_OPERATION_COMPOSER)
+			  << get_defs(GEGL_TYPE_OPERATION_COMPOSER3)
 			  << get_defs(GEGL_TYPE_OPERATION_POINT_COMPOSER)
+			  << get_defs(GEGL_TYPE_OPERATION_POINT_COMPOSER3)
 			  << get_defs(GEGL_TYPE_OPERATION_POINT_FILTER)
               << get_defs(GEGL_TYPE_OPERATION_POINT_RENDER)
 			  << get_defs(GEGL_TYPE_OPERATION_AREA_FILTER)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]