diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2018-11-11 00:16:17 -0500 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2018-11-11 00:16:17 -0500 |
| commit | dcb63868333ba8e229fd8756377151440dd9fd23 (patch) | |
| tree | 43724227c6e0e66919767fd69cb288302e3b61bf | |
| parent | 109891d49876de4de14a91adefbdf681c2b9acc2 (diff) | |
[shape-plan] Remove use of custom null object
| -rw-r--r-- | src/hb-shape-plan.cc | 24 | ||||
| -rw-r--r-- | src/hb-shape-plan.hh | 1 |
2 files changed, 0 insertions, 25 deletions
diff --git a/src/hb-shape-plan.cc b/src/hb-shape-plan.cc index 644c1b6b..8fcc038f 100644 --- a/src/hb-shape-plan.cc +++ b/src/hb-shape-plan.cc @@ -103,30 +103,6 @@ hb_shape_plan_plan (hb_shape_plan_t *shape_plan, * hb_shape_plan_t */ -DEFINE_NULL_INSTANCE (hb_shape_plan_t) = -{ - HB_OBJECT_HEADER_STATIC, - - nullptr, /* face */ - false, /* custom_shaper_list */ - HB_SEGMENT_PROPERTIES_DEFAULT, /* props */ - - nullptr, /* shaper_func */ - nullptr, /* shaper_name */ - - nullptr, /* user_features */ - 0, /* num_user_featurs */ - - nullptr, /* coords */ - 0, /* num_coords */ - - { -#define HB_SHAPER_IMPLEMENT(shaper) HB_ATOMIC_PTR_INIT (HB_SHAPER_DATA_INVALID), -#include "hb-shaper-list.hh" -#undef HB_SHAPER_IMPLEMENT - }, -}; - /** * hb_shape_plan_create: (Xconstructor) diff --git a/src/hb-shape-plan.hh b/src/hb-shape-plan.hh index fea3e10c..891b9957 100644 --- a/src/hb-shape-plan.hh +++ b/src/hb-shape-plan.hh @@ -50,7 +50,6 @@ struct hb_shape_plan_t struct hb_shaper_data_t shaper_data; }; -DECLARE_NULL_INSTANCE (hb_shape_plan_t); #define HB_SHAPER_DATA_CREATE_FUNC_EXTRA_ARGS \ , const hb_feature_t *user_features \ |