Merge branch 'gi-text-glyphs' into 'master'

[gobject] Bind cairo_glyph_t and cairo_text_cluster_t

See merge request cairo/cairo!468

2 files changed, 14 insertions, 0 deletions

diff --git a/util/cairo-gobject/cairo-gobject-structs.c b/util/cairo-gobject/cairo-gobject-structs.c
index b9ca7fca4..bb8e96ac8 100644
--- a/util/cairo-gobject/cairo-gobject-structs.c
+++ b/util/cairo-gobject/cairo-gobject-structs.c
@@ -92,3 +92,9 @@ CAIRO_DEFINE_BOXED ("CairoRectangle", cairo_gobject_rectangle,
 COPY_FUNC (rectangle_int)
 CAIRO_DEFINE_BOXED ("CairoRectangleInt", cairo_gobject_rectangle_int, 
                     cairo_gobject_cairo_rectangle_int_copy, g_free);
+COPY_FUNC (glyph)
+CAIRO_DEFINE_BOXED ("CairoGlyph", cairo_gobject_glyph,
+                    cairo_gobject_cairo_glyph_copy, g_free);
+COPY_FUNC (text_cluster)
+CAIRO_DEFINE_BOXED ("CairoTextCluster", cairo_gobject_text_cluster,
+                    cairo_gobject_cairo_text_cluster_copy, g_free);
diff --git a/util/cairo-gobject/cairo-gobject.h b/util/cairo-gobject/cairo-gobject.h
index 459074e83..28aa51c8b 100644
--- a/util/cairo-gobject/cairo-gobject.h
+++ b/util/cairo-gobject/cairo-gobject.h
@@ -91,6 +91,14 @@ cairo_gobject_rectangle_int_get_type (void);
 cairo_public GType
 cairo_gobject_region_get_type (void);
 
+#define CAIRO_GOBJECT_TYPE_GLYPH cairo_gobject_glyph_get_type ()
+cairo_public GType
+cairo_gobject_glyph_get_type (void);
+
+#define CAIRO_GOBJECT_TEXT_CLUSTER_GLYPH cairo_gobject_text_cluster_get_type ()
+cairo_public GType
+cairo_gobject_text_cluster_get_type (void);
+
 /* enums */
 
 #define CAIRO_GOBJECT_TYPE_STATUS cairo_gobject_status_get_type ()