[geglmm] Update for gegl 0.1.0 APIs
- From: Hubert Figuière <hub src gnome org>
- To: svn-commits-list gnome org
- Subject: [geglmm] Update for gegl 0.1.0 APIs
- Date: Mon, 6 Jul 2009 23:33:00 +0000 (UTC)
commit 72baeb18deccf52816ead081a044724d4b43f2e4
Author: Hubert Figuiere <hub figuiere net>
Date: Mon Jul 6 16:56:21 2009 -0400
Update for gegl 0.1.0 APIs
* gegl/src/node.{ccg,hg}
Implement set() and get() with varargs.
Ignore gegl_node_adopt_child()
* gegl/src/color.hg
Minor indent changes.
* gegl/src/processor.hg
Workaround glibmm doc bug.
* gegl/src/Makefile_list_of_hg.am_fragment
* gegl/src/matrix3.{hg,ccg}
New Matrix3
* gegl/src/gegl_methods.defs
* gegl/src/rectangle.hg
Wrap gegl_rectangle_dump()
ChangeLog | 22 +++++++++++++++
gegl/src/Makefile_list_of_hg.am_fragment | 2 +-
gegl/src/color.hg | 4 +-
gegl/src/gegl_methods.defs | 6 ++++
gegl/src/matrix3.ccg | 22 +++++++++++++++
gegl/src/matrix3.hg | 42 ++++++++++++++++++++++++++++++
gegl/src/node.ccg | 21 ++++++++++++++-
gegl/src/node.hg | 13 +++++---
gegl/src/processor.hg | 2 +-
gegl/src/rectangle.hg | 2 +
10 files changed, 126 insertions(+), 10 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 6ec67a1..d51db7b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2009-07-06 Hubert Figuiere <hub figuiere net>
+
+ Update for gegl 0.1.0 APIs
+
+ * gegl/src/node.{ccg,hg}
+ Implement set() and get() with varargs.
+ Ignore gegl_node_adopt_child()
+
+ * gegl/src/color.hg
+ Minor indent changes.
+
+ * gegl/src/processor.hg
+ Workaround glibmm doc bug.
+
+ * gegl/src/Makefile_list_of_hg.am_fragment
+ * gegl/src/matrix3.{hg,ccg}
+ New Matrix3
+
+ * gegl/src/gegl_methods.defs
+ * gegl/src/rectangle.hg
+ Wrap gegl_rectangle_dump()
+
2009-06-23 Hubert Figuiere <hub figuiere net>
* configure.in: Bump SO_VERSION.
diff --git a/gegl/src/Makefile_list_of_hg.am_fragment b/gegl/src/Makefile_list_of_hg.am_fragment
index c35584c..5bd7475 100644
--- a/gegl/src/Makefile_list_of_hg.am_fragment
+++ b/gegl/src/Makefile_list_of_hg.am_fragment
@@ -3,5 +3,5 @@
# 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 path.hg
+ operation.hg path.hg matrix3.hg
diff --git a/gegl/src/color.hg b/gegl/src/color.hg
index 9d27a13..afc5992 100644
--- a/gegl/src/color.hg
+++ b/gegl/src/color.hg
@@ -1,6 +1,6 @@
/* libgeglmm - a C++ wrapper for libgegl
*
- * (c) 2008 Hubert Figuiere
+ * (c) 2008-2009 Hubert Figuiere
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -36,7 +36,7 @@ public:
_WRAP_CREATE(const Glib::ustring & s)
_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_METHOD(void get_rgba4f(gfloat*) const, gegl_color_get_rgba4f)
_WRAP_PROPERTY("string", Glib::ustring)
};
diff --git a/gegl/src/gegl_methods.defs b/gegl/src/gegl_methods.defs
index e4c6bfa..ae21a71 100644
--- a/gegl/src/gegl_methods.defs
+++ b/gegl/src/gegl_methods.defs
@@ -1630,6 +1630,12 @@
(return-type "gboolean")
)
+(define-method dump
+ (of-object "GeglRectangle")
+ (c-name "gegl_rectangle_dump")
+ (return-type "none")
+)
+
(define-function gegl_malloc
(c-name "gegl_malloc")
(return-type "gpointer")
diff --git a/gegl/src/matrix3.ccg b/gegl/src/matrix3.ccg
new file mode 100644
index 0000000..63eafc7
--- /dev/null
+++ b/gegl/src/matrix3.ccg
@@ -0,0 +1,22 @@
+/* libgeglmm - a C++ wrapper for libgegl
+ *
+ * (c) 2009 Hubert Figuiere
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with GEGL; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+
+
+
diff --git a/gegl/src/matrix3.hg b/gegl/src/matrix3.hg
new file mode 100644
index 0000000..c078ec1
--- /dev/null
+++ b/gegl/src/matrix3.hg
@@ -0,0 +1,42 @@
+/* libgeglmm - a C++ wrapper for libgegl
+ *
+ * (c) 2009 Hubert Figuiere
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with GEGL; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include <gegl-matrix.h>
+
+_DEFS(geglmm,gegl)
+_PINCLUDE(glibmm/private/object_p.h)
+
+// TODO
+
+namespace Gegl
+{
+
+
+//typedef ::GeglMatrix3 Matrix3;
+
+
+
+//inline bool operator==(const Matrix3 m1, const Matrix3 m2)
+//{
+// return gegl_matrix3_equal(m1, m2);
+//}
+
+
+
+}
diff --git a/gegl/src/node.ccg b/gegl/src/node.ccg
index 491844b..f55e430 100644
--- a/gegl/src/node.ccg
+++ b/gegl/src/node.ccg
@@ -1,6 +1,6 @@
/* libgeglmm - a C++ wrapper for libgegl
*
- * (c) 2008 Hubert Figuiere
+ * (c) 2008-2009 Hubert Figuiere
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -57,5 +57,24 @@ namespace Gegl {
}
+ void Node::set(const Glib::ustring & first_property_name, ...)
+ {
+ va_list var_args;
+
+ va_start (var_args, first_property_name);
+ gegl_node_set_valist(gobj(), first_property_name.c_str(), var_args);
+ va_end (var_args);
+ }
+
+
+ void Node::get(const Glib::ustring & first_property_name, ...)
+ {
+ va_list var_args;
+
+ va_start (var_args, first_property_name);
+ gegl_node_get_valist(gobj(), first_property_name.c_str(), var_args);
+ va_end (var_args);
+ }
+
}
diff --git a/gegl/src/node.hg b/gegl/src/node.hg
index acaf901..7b033f1 100644
--- a/gegl/src/node.hg
+++ b/gegl/src/node.hg
@@ -1,6 +1,6 @@
/* libgeglmm - a C++ wrapper for libgegl
*
- * (c) 2008 Hubert Figuiere
+ * (c) 2008-2009 Hubert Figuiere
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -63,12 +63,17 @@ public:
_WRAP_METHOD(bool disconnect(const Glib::ustring & input_pad), gegl_node_disconnect)
_IGNORE(gegl_node_set)
_IGNORE(gegl_node_get)
-// _WRAP_METHOD(void set(const Glib::ustring & first_property_name, ...) G_GNUC_NULL_TERMINATED, gegl_node_set)
-// _WRAP_METHOD(void get(const Glib::ustring & first_property_name, ...) G_GNUC_NULL_TERMINATED, gegl_node_get)
+ _IGNORE(gegl_node_set_valist)
+ _IGNORE(gegl_node_get_valist)
+
+ void set(const Glib::ustring & first_property_name, ...) G_GNUC_NULL_TERMINATED;
+ void get(const Glib::ustring & first_property_name, ...) G_GNUC_NULL_TERMINATED;
_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)
+ _IGNORE(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)
@@ -103,8 +108,6 @@ public:
_WRAP_METHOD(Glib::RefPtr<Node> create_child(const Glib::ustring & operation), gegl_node_create_child)
- _IGNORE(gegl_node_get)
- _IGNORE(gegl_node_set)
_IGNORE(gegl_node_get_property)
_IGNORE(gegl_node_set_property)
diff --git a/gegl/src/processor.hg b/gegl/src/processor.hg
index 45760de..f5b0af1 100644
--- a/gegl/src/processor.hg
+++ b/gegl/src/processor.hg
@@ -17,7 +17,7 @@
*/
-_DEFS(geglmm, gegl)
+_DEFS(geglmm,gegl)
_PINCLUDE(glibmm/private/object_p.h)
diff --git a/gegl/src/rectangle.hg b/gegl/src/rectangle.hg
index 68a1572..d89097e 100644
--- a/gegl/src/rectangle.hg
+++ b/gegl/src/rectangle.hg
@@ -38,6 +38,8 @@ public:
_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)
+
+ _WRAP_METHOD(void dump() const, gegl_rectangle_dump)
};
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]