From 218e67b9eefa26e2e4fe43f99a84d082b185b1b0 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Thu, 5 May 2011 15:28:37 -0400 Subject: [PATCH] Shrink code --- src/hb-common.cc | 26 ++++++++++++++++++++++++++ src/hb-object-private.hh | 21 ++++----------------- 2 files changed, 30 insertions(+), 17 deletions(-) diff --git a/src/hb-common.cc b/src/hb-common.cc index 368789a..68c8711 100644 --- a/src/hb-common.cc +++ b/src/hb-common.cc @@ -29,6 +29,7 @@ #include "hb-private.hh" #include "hb-mutex-private.hh" +#include "hb-object-private.hh" HB_BEGIN_DECLS @@ -261,4 +262,29 @@ hb_script_get_horizontal_direction (hb_script_t script) } +/* hb_user_data_array_t */ + +bool +hb_user_data_array_t::set (hb_user_data_key_t *key, + void * data, + hb_destroy_func_t destroy) +{ + if (!key) + return false; + if (!data && !destroy) { + items.remove (key); + return true; + } + hb_user_data_item_t item = {key, data, destroy}; + return !!items.insert (item); +} + +void * +hb_user_data_array_t::get (hb_user_data_key_t *key) +{ + hb_user_data_item_t *item = items.find (key); + return item ? item->data : NULL; +} + + HB_END_DECLS diff --git a/src/hb-object-private.hh b/src/hb-object-private.hh index dc7dba9..d3207b0 100644 --- a/src/hb-object-private.hh +++ b/src/hb-object-private.hh @@ -121,24 +121,11 @@ struct hb_user_data_array_t { hb_set_t items; - inline bool set (hb_user_data_key_t *key, - void * data, - hb_destroy_func_t destroy) - { - if (!key) - return false; - if (!data && !destroy) { - items.remove (key); - return true; - } - hb_user_data_item_t item = {key, data, destroy}; - return !!items.insert (item); - } + HB_INTERNAL bool set (hb_user_data_key_t *key, + void * data, + hb_destroy_func_t destroy); - inline void *get (hb_user_data_key_t *key) { - hb_user_data_item_t *item = items.find (key); - return item ? item->data : NULL; - } + HB_INTERNAL void *get (hb_user_data_key_t *key); void finish (void) { items.finish (); } }; -- 2.7.4