Imported Upstream version 1.2.7

[platform/upstream/harfbuzz.git] / src / hb-gobject-structs.cc

diff --git a/src/hb-gobject-structs.cc b/src/hb-gobject-structs.cc
index cec4854..6bd6336 100644 (file)
--- a/src/hb-gobject-structs.cc
+++ b/src/hb-gobject-structs.cc
@@ -37,27 +37,44 @@
 
 #include "hb-gobject.h"
 
-#define _HB_DEFINE_BOXED_TYPE(Name,underscore_name,copy_func,free_func) \
+#define HB_DEFINE_BOXED_TYPE(name,copy_func,free_func) \
 GType \
-underscore_name##_get_type (void) \
+hb_gobject_##name##_get_type (void) \
 { \
-   static volatile gsize type = 0; \
-   if (g_once_init_enter (&type)) { \
-      GType t = g_boxed_type_register_static (g_intern_static_string (#Name), \
-                                             (GBoxedCopyFunc) copy_func, \
-                                             (GBoxedFreeFunc) free_func); \
-      g_once_init_leave (&type, t); \
+   static gsize type_id = 0; \
+   if (g_once_init_enter (&type_id)) { \
+      GType id = g_boxed_type_register_static (g_intern_static_string ("hb_" #name "_t"), \
+                                              (GBoxedCopyFunc) copy_func, \
+                                              (GBoxedFreeFunc) free_func); \
+      g_once_init_leave (&type_id, id); \
    } \
-   return type; \
+   return type_id; \
 }
 
-#define HB_DEFINE_BOXED_TYPE(name) \
-       _HB_DEFINE_BOXED_TYPE (hb_##name, hb_gobject_##name, hb_##name##_reference, hb_##name##_destroy);
+#define HB_DEFINE_OBJECT_TYPE(name) \
+       HB_DEFINE_BOXED_TYPE (name, hb_##name##_reference, hb_##name##_destroy);
 
-HB_DEFINE_BOXED_TYPE (buffer)
-HB_DEFINE_BOXED_TYPE (blob)
-HB_DEFINE_BOXED_TYPE (face)
-HB_DEFINE_BOXED_TYPE (font)
-HB_DEFINE_BOXED_TYPE (font_funcs)
-HB_DEFINE_BOXED_TYPE (unicode_funcs)
+#define HB_DEFINE_VALUE_TYPE(name) \
+       static hb_##name##_t *_hb_##name##_reference (const hb_##name##_t *l) \
+       { \
+         hb_##name##_t *c = (hb_##name##_t *) calloc (1, sizeof (hb_##name##_t)); \
+         if (unlikely (!c)) return NULL; \
+         *c = *l; \
+         return c; \
+       } \
+       static void _hb_##name##_destroy (hb_##name##_t *l) { free (l); } \
+       HB_DEFINE_BOXED_TYPE (name, _hb_##name##_reference, _hb_##name##_destroy);
 
+HB_DEFINE_OBJECT_TYPE (buffer)
+HB_DEFINE_OBJECT_TYPE (blob)
+HB_DEFINE_OBJECT_TYPE (face)
+HB_DEFINE_OBJECT_TYPE (font)
+HB_DEFINE_OBJECT_TYPE (font_funcs)
+HB_DEFINE_OBJECT_TYPE (set)
+HB_DEFINE_OBJECT_TYPE (shape_plan)
+HB_DEFINE_OBJECT_TYPE (unicode_funcs)
+HB_DEFINE_VALUE_TYPE (feature)
+HB_DEFINE_VALUE_TYPE (glyph_info)
+HB_DEFINE_VALUE_TYPE (glyph_position)
+HB_DEFINE_VALUE_TYPE (segment_properties)
+HB_DEFINE_VALUE_TYPE (user_data_key)