GNOME.org
 

[geglmm] Update for gegl master.

commit fda9a37c8773fcf86657dc57a24a4ab8fbff3699
Author: Hubert Figuiere <hub figuiere net>
Date:   Sat May 16 03:35:10 2009 -0400

    Update for gegl master.
---
 ChangeLog                  |   11 +
 gegl/src/color.hg          |    6 +-
 gegl/src/gegl_enums.defs   |   21 +-
 gegl/src/gegl_methods.defs |  780 +++++++++-----------------------------------
 gegl/src/node.hg           |    6 +-
 gegl/src/path.hg           |   13 +-
 gegl/src/rectangle.hg      |    1 +
 7 files changed, 193 insertions(+), 645 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cd7dbe9..0377f95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2009-05-16  Hubert Figuiere  <hub figuiere net>
+
+	Update for gegl master.
+	
+	* gegl/src/color.hg
+	* gegl/src/gegl_enums.defs
+	* gegl/src/gegl_methods.defs
+	* gegl/src/node.hg
+	* gegl/src/path.hg
+	* gegl/src/rectangle.hg
+
 2009-02-15  Dodji Seketeli <dodji redhat com>
 
 	* examples/geglbuffer-clock.cc (main): Remove some unused
diff --git a/gegl/src/color.hg b/gegl/src/color.hg
index ce5343e..9d27a13 100644
--- a/gegl/src/color.hg
+++ b/gegl/src/color.hg
@@ -34,9 +34,9 @@ protected:
 
 public:
 	_WRAP_CREATE(const Glib::ustring & s)
-	_WRAP_METHOD(void get_rgba(float & r, float & g, float & b, float & a) const, gegl_color_get_rgba)
-	_WRAP_METHOD(void set_rgba(float r, float g, float b, float a), gegl_color_set_rgba)
-    _WRAP_METHOD(const gfloat* get_float4() const, gegl_color_float4)
+	_WRAP_METHOD(void get_rgba(double & r, double & g, double & b, double & a) const, gegl_color_get_rgba)
+	_WRAP_METHOD(void set_rgba(double r, double g, double b, double a), gegl_color_set_rgba)
+  _WRAP_METHOD(void get_rgba4f(gfloat*) const, gegl_color_rgba4f)
 
 	_WRAP_PROPERTY("string", Glib::ustring)
 };
diff --git a/gegl/src/gegl_enums.defs b/gegl/src/gegl_enums.defs
index 96582d7..d177896 100644
--- a/gegl/src/gegl_enums.defs
+++ b/gegl/src/gegl_enums.defs
@@ -1,4 +1,4 @@
-;; From /usr/include/gegl-0.0/gegl-buffer.h
+;; From /opt/include/gegl-0.0/gegl-buffer.h
 
 (define-enum-extended Interpolation
   (in-module "Gegl")
@@ -8,26 +8,27 @@
     '("linear" "GEGL_INTERPOLATION_LINEAR" "1")
     '("cubic" "GEGL_INTERPOLATION_CUBIC" "2")
     '("lanczos" "GEGL_INTERPOLATION_LANCZOS" "3")
-    '("yafr" "GEGL_INTERPOLATION_YAFR" "4")
+    '("sharp" "GEGL_INTERPOLATION_SHARP" "4")
+    '("yafr" "GEGL_INTERPOLATION_YAFR" "5")
   )
 )
 
-;; From /usr/include/gegl-0.0/gegl.h
+;; From /opt/include/gegl-0.0/gegl-types.h
 
-(define-flags-extended BlitFlags
+(define-enum-extended PadType
   (in-module "Gegl")
-  (c-name "GeglBlitFlags")
+  (c-name "GeglPadType")
   (values
-    '("default" "GEGL_BLIT_DEFAULT" "0")
-    '("cache" "GEGL_BLIT_CACHE" "1 << 0")
-    '("dirty" "GEGL_BLIT_DIRTY" "1 << 1")
   )
 )
 
-(define-enum-extended PadType
+(define-flags-extended BlitFlags
   (in-module "Gegl")
-  (c-name "GeglPadType")
+  (c-name "GeglBlitFlags")
   (values
+    '("default" "GEGL_BLIT_DEFAULT" "0")
+    '("cache" "GEGL_BLIT_CACHE" "1 << 0")
+    '("dirty" "GEGL_BLIT_DIRTY" "1 << 1")
   )
 )
 
diff --git a/gegl/src/gegl_methods.defs b/gegl/src/gegl_methods.defs
index c660856..e4c6bfa 100644
--- a/gegl/src/gegl_methods.defs
+++ b/gegl/src/gegl_methods.defs
@@ -1,26 +1,5 @@
 ;; -*- scheme -*-
 ; object definitions ...
-(define-object Color
-  (in-module "Gegl")
-  (parent "GObject")
-  (c-name "GeglColor")
-  (gtype-id "GEGL_TYPE_COLOR")
-)
-
-(define-object Curve
-  (in-module "Gegl")
-  (parent "GObject")
-  (c-name "GeglCurve")
-  (gtype-id "GEGL_TYPE_CURVE")
-)
-
-(define-object Operation
-  (in-module "Gegl")
-  (parent "GObject")
-  (c-name "GeglOperation")
-  (gtype-id "GEGL_TYPE_OPERATION")
-)
-
 (define-object Chant
   (in-module "Gegl")
   (parent "GeglOperation")
@@ -28,51 +7,23 @@
   (gtype-id "GEGL_TYPE_CHANT")
 )
 
-(define-object OperationComposer
-  (in-module "Gegl")
-  (parent "GeglOperation")
-  (c-name "GeglOperationComposer")
-  (gtype-id "GEGL_TYPE_OPERATION_COMPOSER")
-)
-
 (define-object Chant
   (in-module "Gegl")
-  (parent "GeglOperationComposer")
+  (parent "GeglOperationAreaFilter")
   (c-name "GeglChant")
   (gtype-id "GEGL_TYPE_CHANT")
 )
 
-(define-object OperationComposer3
-  (in-module "Gegl")
-  (parent "GeglOperation")
-  (c-name "GeglOperationComposer3")
-  (gtype-id "GEGL_TYPE_OPERATION_COMPOSER3")
-)
-
 (define-object Chant
   (in-module "Gegl")
-  (parent "GeglOperationComposer3")
+  (parent "GeglOperationComposer")
   (c-name "GeglChant")
   (gtype-id "GEGL_TYPE_CHANT")
 )
 
-(define-object OperationFilter
-  (in-module "Gegl")
-  (parent "GeglOperation")
-  (c-name "GeglOperationFilter")
-  (gtype-id "GEGL_TYPE_OPERATION_FILTER")
-)
-
-(define-object OperationAreaFilter
-  (in-module "Gegl")
-  (parent "GeglOperationFilter")
-  (c-name "GeglOperationAreaFilter")
-  (gtype-id "GEGL_TYPE_OPERATION_AREA_FILTER")
-)
-
 (define-object Chant
   (in-module "Gegl")
-  (parent "GeglOperationAreaFilter")
+  (parent "GeglOperationComposer3")
   (c-name "GeglChant")
   (gtype-id "GEGL_TYPE_CHANT")
 )
@@ -84,13 +35,6 @@
   (gtype-id "GEGL_TYPE_CHANT")
 )
 
-(define-object OperationMeta
-  (in-module "Gegl")
-  (parent "GeglOperation")
-  (c-name "GeglOperationMeta")
-  (gtype-id "GEGL_TYPE_OPERATION_META")
-)
-
 (define-object Chant
   (in-module "Gegl")
   (parent "GeglOperationMeta")
@@ -98,13 +42,6 @@
   (gtype-id "GEGL_TYPE_CHANT")
 )
 
-(define-object OperationPointComposer
-  (in-module "Gegl")
-  (parent "GeglOperationComposer")
-  (c-name "GeglOperationPointComposer")
-  (gtype-id "GEGL_TYPE_OPERATION_POINT_COMPOSER")
-)
-
 (define-object Chant
   (in-module "Gegl")
   (parent "GeglOperationPointComposer")
@@ -112,13 +49,6 @@
   (gtype-id "GEGL_TYPE_CHANT")
 )
 
-(define-object OperationPointComposer3
-  (in-module "Gegl")
-  (parent "GeglOperationComposer3")
-  (c-name "GeglOperationPointComposer3")
-  (gtype-id "GEGL_TYPE_OPERATION_POINT_COMPOSER3")
-)
-
 (define-object Chant
   (in-module "Gegl")
   (parent "GeglOperationPointComposer3")
@@ -126,13 +56,6 @@
   (gtype-id "GEGL_TYPE_CHANT")
 )
 
-(define-object OperationPointFilter
-  (in-module "Gegl")
-  (parent "GeglOperationFilter")
-  (c-name "GeglOperationPointFilter")
-  (gtype-id "GEGL_TYPE_OPERATION_POINT_FILTER")
-)
-
 (define-object Chant
   (in-module "Gegl")
   (parent "GeglOperationPointFilter")
@@ -140,11 +63,11 @@
   (gtype-id "GEGL_TYPE_CHANT")
 )
 
-(define-object OperationSink
+(define-object Chant
   (in-module "Gegl")
-  (parent "GeglOperation")
-  (c-name "GeglOperationSink")
-  (gtype-id "GEGL_TYPE_OPERATION_SINK")
+  (parent "GeglOperationPointRender")
+  (c-name "GeglChant")
+  (gtype-id "GEGL_TYPE_CHANT")
 )
 
 (define-object Chant
@@ -154,46 +77,32 @@
   (gtype-id "GEGL_TYPE_CHANT")
 )
 
-(define-object OperationSource
-  (in-module "Gegl")
-  (parent "GeglOperation")
-  (c-name "GeglOperationSource")
-  (gtype-id "GEGL_TYPE_OPERATION_SOURCE")
-)
-
-(define-object OperationPointRender
-  (in-module "Gegl")
-  (parent "GeglOperationSource")
-  (c-name "GeglOperationPointRender")
-  (gtype-id "GEGL_TYPE_OPERATION_POINT_RENDER")
-)
-
 (define-object Chant
   (in-module "Gegl")
-  (parent "GeglOperationPointRender")
+  (parent "GeglOperationSource")
   (c-name "GeglChant")
   (gtype-id "GEGL_TYPE_CHANT")
 )
 
 (define-object Chant
   (in-module "Gegl")
-  (parent "GeglOperationSource")
+  (parent "GeglOperationTemporal")
   (c-name "GeglChant")
   (gtype-id "GEGL_TYPE_CHANT")
 )
 
-(define-object OperationTemporal
+(define-object Color
   (in-module "Gegl")
-  (parent "GeglOperationFilter")
-  (c-name "GeglOperationTemporal")
-  (gtype-id "GEGL_TYPE_OPERATION_TEMPORAL")
+  (parent "GObject")
+  (c-name "GeglColor")
+  (gtype-id "GEGL_TYPE_COLOR")
 )
 
-(define-object Chant
+(define-object Curve
   (in-module "Gegl")
-  (parent "GeglOperationTemporal")
-  (c-name "GeglChant")
-  (gtype-id "GEGL_TYPE_CHANT")
+  (parent "GObject")
+  (c-name "GeglCurve")
+  (gtype-id "GEGL_TYPE_CURVE")
 )
 
 ;; Enumerations and flags ...
@@ -207,10 +116,21 @@
     '("linear" "GEGL_INTERPOLATION_LINEAR")
     '("cubic" "GEGL_INTERPOLATION_CUBIC")
     '("lanczos" "GEGL_INTERPOLATION_LANCZOS")
+    '("sharp" "GEGL_INTERPOLATION_SHARP")
     '("yafr" "GEGL_INTERPOLATION_YAFR")
   )
 )
 
+(define-flags PadType
+  (in-module "Gegl")
+  (c-name "GeglPadType")
+  (gtype-id "GEGL_TYPE_PAD_TYPE")
+  (values
+    '("output" "GEGL_PARAM_PAD_OUTPUT")
+    '("input" "GEGL_PARAM_PAD_INPUT")
+  )
+)
+
 (define-flags BlitFlags
   (in-module "Gegl")
   (c-name "GeglBlitFlags")
@@ -222,16 +142,6 @@
   )
 )
 
-(define-flags PadType
-  (in-module "Gegl")
-  (c-name "GeglPadType")
-  (gtype-id "GEGL_TYPE_PAD_TYPE")
-  (values
-    '("output" "GEGL_PARAM_PAD_OUTPUT")
-    '("input" "GEGL_PARAM_PAD_INPUT")
-  )
-)
-
 
 ;; From gegl-buffer.h
 
@@ -488,29 +398,32 @@
   (c-name "gegl_color_get_rgba")
   (return-type "none")
   (parameters
-    '("gfloat*" "r")
-    '("gfloat*" "g")
-    '("gfloat*" "b")
-    '("gfloat*" "a")
+    '("gdouble*" "red")
+    '("gdouble*" "green")
+    '("gdouble*" "blue")
+    '("gdouble*" "alpha")
   )
 )
 
-(define-method set_rgba
+(define-method get_rgba4f
   (of-object "GeglColor")
-  (c-name "gegl_color_set_rgba")
+  (c-name "gegl_color_get_rgba4f")
   (return-type "none")
   (parameters
-    '("gfloat" "r")
-    '("gfloat" "g")
-    '("gfloat" "b")
-    '("gfloat" "a")
+    '("gfloat*" "buf")
   )
 )
 
-(define-method float4
+(define-method set_rgba
   (of-object "GeglColor")
-  (c-name "gegl_color_float4")
-  (return-type "const-gfloat*")
+  (c-name "gegl_color_set_rgba")
+  (return-type "none")
+  (parameters
+    '("gdouble" "red")
+    '("gdouble" "green")
+    '("gdouble" "blue")
+    '("gdouble" "alpha")
+  )
 )
 
 (define-function gegl_param_color_get_type
@@ -561,11 +474,6 @@
   )
 )
 
-(define-function gegl_curve_default_curve
-  (c-name "gegl_curve_default_curve")
-  (return-type "GeglCurve*")
-)
-
 (define-method get_y_bounds
   (of-object "GeglCurve")
   (c-name "gegl_curve_get_y_bounds")
@@ -576,18 +484,6 @@
   )
 )
 
-(define-method get_bounds
-  (of-object "GeglCurve")
-  (c-name "gegl_curve_get_bounds")
-  (return-type "none")
-  (parameters
-    '("gdouble*" "min_x")
-    '("gdouble*" "max_x")
-    '("gdouble*" "min_y")
-    '("gdouble*" "max_y")
-  )
-)
-
 (define-method add_point
   (of-object "GeglCurve")
   (c-name "gegl_curve_add_point")
@@ -648,6 +544,11 @@
   )
 )
 
+(define-function gegl_curve_default_curve
+  (c-name "gegl_curve_default_curve")
+  (return-type "GeglCurve*")
+)
+
 (define-function gegl_param_curve_get_type
   (c-name "gegl_param_curve_get_type")
   (return-type "GType")
@@ -688,16 +589,6 @@
   (return-type "none")
 )
 
-(define-function gegl_get_version
-  (c-name "gegl_get_version")
-  (return-type "none")
-  (parameters
-    '("int*" "major")
-    '("int*" "minor")
-    '("int*" "micro")
-  )
-)
-
 (define-function gegl_list_operations
   (c-name "gegl_list_operations")
   (return-type "gchar**")
@@ -715,16 +606,6 @@
   )
 )
 
-(define-function gegl_node_get_type
-  (c-name "gegl_node_get_type")
-  (return-type "GType")
-)
-
-(define-function gegl_rectangle_get_type
-  (c-name "gegl_rectangle_get_type")
-  (return-type "GType")
-)
-
 (define-function gegl_node_new
   (c-name "gegl_node_new")
   (is-constructor-of "GeglNode")
@@ -801,6 +682,16 @@
   (varargs #t)
 )
 
+(define-method set_valist
+  (of-object "GeglNode")
+  (c-name "gegl_node_set_valist")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "first_property_name")
+    '("va_list" "args")
+  )
+)
+
 (define-method get
   (of-object "GeglNode")
   (c-name "gegl_node_get")
@@ -811,6 +702,16 @@
   (varargs #t)
 )
 
+(define-method get_valist
+  (of-object "GeglNode")
+  (c-name "gegl_node_get_valist")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "first_property_name")
+    '("va_list" "args")
+  )
+)
+
 (define-method blit
   (of-object "GeglNode")
   (c-name "gegl_node_blit")
@@ -995,11 +896,6 @@
   )
 )
 
-(define-function gegl_processor_get_type
-  (c-name "gegl_processor_get_type")
-  (return-type "GType")
-)
-
 (define-method new_processor
   (of-object "GeglNode")
   (c-name "gegl_node_new_processor")
@@ -1035,7 +931,7 @@
 
 (define-function gegl_config
   (c-name "gegl_config")
-  (return-type "GObject*")
+  (return-type "GeglConfig*")
 )
 
 
@@ -1318,7 +1214,7 @@
   (c-name "gegl_path_new_from_string")
   (return-type "GeglPath*")
   (parameters
-    '("const-gchar*" "path_string")
+    '("const-gchar*" "instructions")
   )
 )
 
@@ -1343,9 +1239,10 @@
 (define-method get_node
   (of-object "GeglPath")
   (c-name "gegl_path_get_node")
-  (return-type "const-GeglPathItem*")
+  (return-type "gboolean")
   (parameters
-    '("gint" "pos")
+    '("gint" "index")
+    '("GeglPathItem*" "node")
   )
 )
 
@@ -1355,18 +1252,18 @@
   (return-type "gchar*")
 )
 
-(define-method get_matrix
+(define-method set_matrix
   (of-object "GeglPath")
-  (c-name "gegl_path_get_matrix")
+  (c-name "gegl_path_set_matrix")
   (return-type "none")
   (parameters
     '("GeglMatrix3" "matrix")
   )
 )
 
-(define-method set_matrix
+(define-method get_matrix
   (of-object "GeglPath")
-  (c-name "gegl_path_set_matrix")
+  (c-name "gegl_path_get_matrix")
   (return-type "none")
   (parameters
     '("GeglMatrix3" "matrix")
@@ -1380,8 +1277,8 @@
   (parameters
     '("gdouble" "x")
     '("gdouble" "y")
-    '("gdouble*" "dx")
-    '("gdouble*" "dy")
+    '("gdouble*" "on_path_x")
+    '("gdouble*" "on_path_y")
     '("gint*" "node_pos_before")
   )
 )
@@ -1392,8 +1289,8 @@
   (return-type "none")
   (parameters
     '("gdouble" "pos")
-    '("gdouble*" "dest_x")
-    '("gdouble*" "dest_y")
+    '("gdouble*" "x")
+    '("gdouble*" "y")
   )
 )
 
@@ -1403,8 +1300,8 @@
   (return-type "none")
   (parameters
     '("guint" "num_samples")
-    '("gdouble*" "dest_xs")
-    '("gdouble*" "dest_ys")
+    '("gdouble*" "xs")
+    '("gdouble*" "ys")
   )
 )
 
@@ -1425,7 +1322,8 @@
   (c-name "gegl_path_foreach")
   (return-type "none")
   (parameters
-    '("foreach_fun_t" "each_item")
+    '("GeglNodeFunction" "each_item")
+    '("gpointer" "user_data")
   )
 )
 
@@ -1434,7 +1332,8 @@
   (c-name "gegl_path_foreach_flat")
   (return-type "none")
   (parameters
-    '("foreach_fun_t" "each_item")
+    '("GeglNodeFunction" "each_item")
+    '("gpointer" "user_data")
   )
 )
 
@@ -1450,7 +1349,7 @@
   (return-type "none")
   (parameters
     '("gint" "pos")
-    '("const-GeglPathItem*" "knot")
+    '("const-GeglPathItem*" "node")
   )
 )
 
@@ -1460,7 +1359,7 @@
   (return-type "none")
   (parameters
     '("gint" "pos")
-    '("const-GeglPathItem*" "knot")
+    '("const-GeglPathItem*" "node")
   )
 )
 
@@ -1478,7 +1377,7 @@
   (c-name "gegl_path_parse_string")
   (return-type "none")
   (parameters
-    '("const-gchar*" "path_string")
+    '("const-gchar*" "instructions")
   )
 )
 
@@ -1491,63 +1390,16 @@
   (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
+(define-method freeze
   (of-object "GeglPath")
-  (c-name "gegl_path_parameter_get_bounds")
+  (c-name "gegl_path_freeze")
   (return-type "none")
-  (parameters
-    '("const-gchar*" "parameter_name")
-    '("gdouble*" "min_value")
-    '("gdouble*" "max_value")
-  )
 )
 
-(define-method parameter_calc_values
+(define-method thaw
   (of-object "GeglPath")
-  (c-name "gegl_path_parameter_calc_values")
+  (c-name "gegl_path_thaw")
   (return-type "none")
-  (parameters
-    '("const-gchar*" "parameter_name")
-    '("guint" "num_samples")
-    '("gdouble*" "samples")
-  )
 )
 
 (define-function gegl_param_spec_path
@@ -1567,19 +1419,12 @@
   (return-type "GType")
 )
 
-(define-method append
-  (of-object "GeglPathList")
-  (c-name "gegl_path_list_append")
-  (return-type "GeglPathList*")
+(define-function gegl_path_type_get_n_items
+  (c-name "gegl_path_type_get_n_items")
+  (return-type "gint")
   (parameters
+    '("gchar" "type")
   )
-  (varargs #t)
-)
-
-(define-method destroy
-  (of-object "GeglPathList")
-  (c-name "gegl_path_list_destroy")
-  (return-type "GeglPathList*")
 )
 
 (define-function gegl_path_add_type
@@ -1587,56 +1432,34 @@
   (return-type "none")
   (parameters
     '("gchar" "type")
-    '("gint" "pairs")
+    '("gint" "items")
     '("const-gchar*" "description")
   )
 )
 
-(define-function gegl_path_add_flattener
-  (c-name "gegl_path_add_flattener")
-  (return-type "none")
+(define-method append
+  (of-object "GeglPathList")
+  (c-name "gegl_path_list_append")
+  (return-type "GeglPathList*")
   (parameters
-    '("flattner_func_t" "func")
   )
+  (varargs #t)
 )
 
-(define-function gegl_path_fill
-  (c-name "gegl_path_fill")
-  (return-type "none")
-  (parameters
-    '("GeglBuffer*" "buffer")
-    '("GeglPath*" "path")
-    '("GeglColor*" "color")
-    '("gboolean" "winding")
-  )
+(define-method destroy
+  (of-object "GeglPathList")
+  (c-name "gegl_path_list_destroy")
+  (return-type "GeglPathList*")
 )
 
-(define-function gegl_path_stroke
-  (c-name "gegl_path_stroke")
+(define-function gegl_path_add_flattener
+  (c-name "gegl_path_add_flattener")
   (return-type "none")
   (parameters
-    '("GeglBuffer*" "buffer")
-    '("const-GeglRectangle*" "clip_rect")
-    '("GeglPath*" "vector")
-    '("GeglColor*" "color")
-    '("gdouble" "linewidth")
-    '("gdouble" "hardness")
-    '("gdouble" "opacity")
+    '("GeglFlattenerFunc" "func")
   )
 )
 
-(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
@@ -1671,9 +1494,9 @@
   )
 )
 
-(define-method set_object
+(define-method take_object
   (of-object "GeglOperationContext")
-  (c-name "gegl_operation_context_set_object")
+  (c-name "gegl_operation_context_take_object")
   (return-type "none")
   (parameters
     '("const-gchar*" "padname")
@@ -1704,6 +1527,25 @@
 
 
 
+;; From gegl-types.h
+
+(define-function gegl_rectangle_get_type
+  (c-name "gegl_rectangle_get_type")
+  (return-type "GType")
+)
+
+(define-function gegl_node_get_type
+  (c-name "gegl_node_get_type")
+  (return-type "GType")
+)
+
+(define-function gegl_processor_get_type
+  (c-name "gegl_processor_get_type")
+  (return-type "GType")
+)
+
+
+
 ;; From gegl-utils.h
 
 (define-method set
@@ -1723,7 +1565,7 @@
   (c-name "gegl_rectangle_equal")
   (return-type "gboolean")
   (parameters
-    '("const-GeglRectangle*" "s")
+    '("const-GeglRectangle*" "rectangle2")
   )
 )
 
@@ -1744,7 +1586,7 @@
   (c-name "gegl_rectangle_copy")
   (return-type "none")
   (parameters
-    '("const-GeglRectangle*" "from")
+    '("const-GeglRectangle*" "source")
   )
 )
 
@@ -1753,8 +1595,8 @@
   (c-name "gegl_rectangle_bounding_box")
   (return-type "none")
   (parameters
-    '("const-GeglRectangle*" "src1")
-    '("const-GeglRectangle*" "src2")
+    '("const-GeglRectangle*" "source1")
+    '("const-GeglRectangle*" "source2")
   )
 )
 
@@ -1773,20 +1615,26 @@
   (c-name "gegl_rectangle_contains")
   (return-type "gboolean")
   (parameters
-    '("const-GeglRectangle*" "s")
+    '("const-GeglRectangle*" "child")
   )
 )
 
-(define-function gegl_rectangle_get_type
-  (c-name "gegl_rectangle_get_type")
-  (return-type "GType")
+(define-function gegl_rectangle_infinite_plane
+  (c-name "gegl_rectangle_infinite_plane")
+  (return-type "GeglRectangle")
+)
+
+(define-method is_infinite_plane
+  (of-object "GeglRectangle")
+  (c-name "gegl_rectangle_is_infinite_plane")
+  (return-type "gboolean")
 )
 
 (define-function gegl_malloc
   (c-name "gegl_malloc")
   (return-type "gpointer")
   (parameters
-    '("gsize" "size")
+    '("gsize" "n_bytes")
   )
 )
 
@@ -1794,339 +1642,21 @@
   (c-name "gegl_free")
   (return-type "none")
   (parameters
-    '("gpointer" "buf")
-  )
-)
-
-
-
-;; From gegl-operation-area-filter.h
-
-(define-function gegl_operation_area_filter_get_type
-  (c-name "gegl_operation_area_filter_get_type")
-  (return-type "GType")
-)
-
-
-
-;; From gegl-operation-composer3.h
-
-(define-function gegl_operation_composer3_get_type
-  (c-name "gegl_operation_composer3_get_type")
-  (return-type "GType")
-)
-
-
-
-;; From gegl-operation-composer.h
-
-(define-function gegl_operation_composer_get_type
-  (c-name "gegl_operation_composer_get_type")
-  (return-type "GType")
-)
-
-
-
-;; From gegl-operation-filter.h
-
-(define-function gegl_operation_filter_get_type
-  (c-name "gegl_operation_filter_get_type")
-  (return-type "GType")
-)
-
-
-
-;; From gegl-operation.h
-
-(define-method add_processor
-  (of-object "GeglOperationClass")
-  (c-name "gegl_operation_class_add_processor")
-  (return-type "none")
-  (parameters
-    '("GCallback" "process")
-    '("const-gchar*" "string")
-  )
-)
-
-(define-function gegl_operation_get_type
-  (c-name "gegl_operation_get_type")
-  (return-type "GType")
-)
-
-(define-method get_invalidated_by_change
-  (of-object "GeglOperation")
-  (c-name "gegl_operation_get_invalidated_by_change")
-  (return-type "GeglRectangle")
-  (parameters
-    '("const-gchar*" "input_pad")
-    '("const-GeglRectangle*" "roi")
-  )
-)
-
-(define-method get_bounding_box
-  (of-object "GeglOperation")
-  (c-name "gegl_operation_get_bounding_box")
-  (return-type "GeglRectangle")
-)
-
-(define-method source_get_bounding_box
-  (of-object "GeglOperation")
-  (c-name "gegl_operation_source_get_bounding_box")
-  (return-type "GeglRectangle*")
-  (parameters
-    '("const-gchar*" "pad_name")
-  )
-)
-
-(define-method get_cached_region
-  (of-object "GeglOperation")
-  (c-name "gegl_operation_get_cached_region")
-  (return-type "GeglRectangle")
-  (parameters
-    '("const-GeglRectangle*" "roi")
-  )
-)
-
-(define-method get_required_for_output
-  (of-object "GeglOperation")
-  (c-name "gegl_operation_get_required_for_output")
-  (return-type "GeglRectangle")
-  (parameters
-    '("const-gchar*" "input_pad")
-    '("const-GeglRectangle*" "roi")
-  )
-)
-
-(define-method detect
-  (of-object "GeglOperation")
-  (c-name "gegl_operation_detect")
-  (return-type "GeglNode*")
-  (parameters
-    '("gint" "x")
-    '("gint" "y")
-  )
-)
-
-(define-method attach
-  (of-object "GeglOperation")
-  (c-name "gegl_operation_attach")
-  (return-type "none")
-  (parameters
-    '("GeglNode*" "node")
-  )
-)
-
-(define-method prepare
-  (of-object "GeglOperation")
-  (c-name "gegl_operation_prepare")
-  (return-type "none")
-)
-
-(define-method process
-  (of-object "GeglOperation")
-  (c-name "gegl_operation_process")
-  (return-type "gboolean")
-  (parameters
-    '("GeglOperationContext*" "context")
-    '("const-gchar*" "output_pad")
-    '("const-GeglRectangle*" "roi")
-  )
-)
-
-(define-method create_pad
-  (of-object "GeglOperation")
-  (c-name "gegl_operation_create_pad")
-  (return-type "none")
-  (parameters
-    '("GParamSpec*" "param_spec")
-  )
-)
-
-(define-method set_format
-  (of-object "GeglOperation")
-  (c-name "gegl_operation_set_format")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "pad_name")
-    '("const-Babl*" "format")
-  )
-)
-
-(define-method get_format
-  (of-object "GeglOperation")
-  (c-name "gegl_operation_get_format")
-  (return-type "const-Babl*")
-  (parameters
-    '("const-gchar*" "pad_name")
-  )
-)
-
-(define-method get_source_node
-  (of-object "GeglOperation")
-  (c-name "gegl_operation_get_source_node")
-  (return-type "GeglNode*")
-  (parameters
-    '("const-gchar*" "pad_name")
-  )
-)
-
-(define-function gegl_list_properties
-  (c-name "gegl_list_properties")
-  (return-type "GParamSpec**")
-  (parameters
-    '("const-gchar*" "operation_type")
-    '("guint*" "n_properties_p")
-  )
-)
-
-(define-method calc_source_regions
-  (of-object "GeglOperation")
-  (c-name "gegl_operation_calc_source_regions")
-  (return-type "gboolean")
-  (parameters
-    '("gpointer" "context_id")
-  )
-)
-
-(define-function gegl_operation_path_prop_changed
-  (c-name "gegl_operation_path_prop_changed")
-  (return-type "none")
-  (parameters
-    '("GeglPath*" "path")
-    '("GeglOperation*" "operation")
-  )
-)
-
-(define-method invalidate
-  (of-object "GeglOperation")
-  (c-name "gegl_operation_invalidate")
-  (return-type "none")
-  (parameters
-    '("const-GeglRectangle*" "roi")
-    '("gboolean" "clear_cache")
-  )
-)
-
-
-
-;; From gegl-operation-meta.h
-
-(define-function gegl_operation_meta_get_type
-  (c-name "gegl_operation_meta_get_type")
-  (return-type "GType")
-)
-
-(define-method meta_redirect
-  (of-object "GeglOperation")
-  (c-name "gegl_operation_meta_redirect")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "name")
-    '("GeglNode*" "internal")
-    '("const-gchar*" "internal_name")
-  )
-)
-
-(define-method property_changed
-  (of-object "GeglOperationMeta")
-  (c-name "gegl_operation_meta_property_changed")
-  (return-type "none")
-  (parameters
-    '("GParamSpec*" "arg1")
-    '("gpointer" "user_data")
+    '("gpointer" "mem")
   )
 )
 
 
 
-;; From gegl-operation-point-composer3.h
-
-(define-function gegl_operation_point_composer3_get_type
-  (c-name "gegl_operation_point_composer3_get_type")
-  (return-type "GType")
-)
-
-
-
-;; From gegl-operation-point-composer.h
-
-(define-function gegl_operation_point_composer_get_type
-  (c-name "gegl_operation_point_composer_get_type")
-  (return-type "GType")
-)
-
-
-
-;; From gegl-operation-point-filter.h
-
-(define-function gegl_operation_point_filter_get_type
-  (c-name "gegl_operation_point_filter_get_type")
-  (return-type "GType")
-)
-
-
-
-;; From gegl-operation-point-render.h
-
-(define-function gegl_operation_point_render_get_type
-  (c-name "gegl_operation_point_render_get_type")
-  (return-type "GType")
-)
-
-
-
-;; From gegl-operation-sink.h
+;; From gegl-version.h
 
-(define-function gegl_operation_sink_get_type
-  (c-name "gegl_operation_sink_get_type")
-  (return-type "GType")
-)
-
-(define-method sink_needs_full
-  (of-object "GeglOperation")
-  (c-name "gegl_operation_sink_needs_full")
-  (return-type "gboolean")
-)
-
-
-
-;; From gegl-operation-source.h
-
-(define-function gegl_operation_source_get_type
-  (c-name "gegl_operation_source_get_type")
-  (return-type "GType")
-)
-
-
-
-;; From gegl-operation-temporal.h
-
-(define-function gegl_operation_temporal_get_type
-  (c-name "gegl_operation_temporal_get_type")
-  (return-type "GType")
-)
-
-(define-method temporal_set_history_length
-  (of-object "GeglOperation")
-  (c-name "gegl_operation_temporal_set_history_length")
+(define-function gegl_get_version
+  (c-name "gegl_get_version")
   (return-type "none")
   (parameters
-    '("gint" "history_length")
-  )
-)
-
-(define-method temporal_get_history_length
-  (of-object "GeglOperation")
-  (c-name "gegl_operation_temporal_get_history_length")
-  (return-type "guint")
-)
-
-(define-method temporal_get_frame
-  (of-object "GeglOperation")
-  (c-name "gegl_operation_temporal_get_frame")
-  (return-type "GeglBuffer*")
-  (parameters
-    '("gint" "frame")
+    '("int*" "major")
+    '("int*" "minor")
+    '("int*" "micro")
   )
 )
 
diff --git a/gegl/src/node.hg b/gegl/src/node.hg
index 9e93e5f..acaf901 100644
--- a/gegl/src/node.hg
+++ b/gegl/src/node.hg
@@ -68,11 +68,9 @@ public:
 
 	_WRAP_METHOD(void blit(double scale, const Rectangle &roi, const Babl * format, void * destination_buf, int rowstride, BlitFlags flags), gegl_node_blit)
 	_WRAP_METHOD(void process(), gegl_node_process)
-	// 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> 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)
diff --git a/gegl/src/path.hg b/gegl/src/path.hg
index 5d510b2..60efa74 100644
--- a/gegl/src/path.hg
+++ b/gegl/src/path.hg
@@ -27,8 +27,14 @@ namespace Gegl
 
 class PathItem
 {
-    _CLASS_GENERIC(PathItem, GeglPathItem)
+  _CLASS_GENERIC(PathItem, GeglPathItem)
 public:
+
+  GeglPathItem* gobj() { return &gobject_; }
+  const GeglPathItem* gobj() const { return &gobject_; }
+
+protected:
+  GeglPathItem gobject_;
 };
 
 
@@ -46,8 +52,9 @@ public:
     _WRAP_METHOD(bool is_empty(), gegl_path_is_empty)
     _WRAP_METHOD(int get_n_nodes(), gegl_path_get_n_nodes)
     _WRAP_METHOD(double get_length(), gegl_path_get_length)
-#m4 _CONVERSION(`const GeglPathItem*',`const PathItem&',`Glib::wrap($3)')
-    _WRAP_METHOD(const GeglPathItem* get_node(int pos), gegl_path_get_node)
+#m4 _CONVERSION(`GeglPathItem*',`PathItem&',`Glib::wrap($3)')
+#m4 _CONVERSION(`PathItem&',`GeglPathItem*',__FCR2P)
+    _WRAP_METHOD(bool get_node(int index, PathItem &), gegl_path_get_node)
 
     _WRAP_METHOD(Glib::ustring to_string(), gegl_path_to_string)
     _WRAP_METHOD(void get_matrix(GeglMatrix3 matrix), gegl_path_get_matrix)
diff --git a/gegl/src/rectangle.hg b/gegl/src/rectangle.hg
index d8c10d7..68a1572 100644
--- a/gegl/src/rectangle.hg
+++ b/gegl/src/rectangle.hg
@@ -37,6 +37,7 @@ public:
 	_WRAP_METHOD(void bounding_box(const Rectangle & src1, const Rectangle & src2), gegl_rectangle_bounding_box)
 	_WRAP_METHOD(bool intersect(const Rectangle & src1, const Rectangle & src2), gegl_rectangle_intersect) //TODO: Make this const?
 	_WRAP_METHOD(bool contains(const Rectangle & s) const, gegl_rectangle_contains)
+  _WRAP_METHOD(bool is_infinite_plane() const, gegl_rectangle_is_infinite_plane)
 };
 
 }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]