[lazy] Add .free()

diff --git a/src/hb-ft.cc b/src/hb-ft.cc
index c58cd87..5ac9a3e 100644 (file)
--- a/src/hb-ft.cc
+++ b/src/hb-ft.cc
@@ -454,7 +454,7 @@ static struct hb_ft_font_funcs_lazy_loader_t : hb_font_funcs_lazy_loader_t<hb_ft
 static
 void free_static_ft_funcs (void)
 {
-  static_ft_funcs.fini ();
+  static_ft_funcs.free ();
 }
 #endif
 

diff --git a/src/hb-glib.cc b/src/hb-glib.cc
index a5a82d4..6ce9a35 100644 (file)
--- a/src/hb-glib.cc
+++ b/src/hb-glib.cc
@@ -394,7 +394,7 @@ static struct hb_glib_unicode_funcs_lazy_loader_t : hb_unicode_funcs_lazy_loader
 static
 void free_static_glib_funcs (void)
 {
-  static_glib_funcs.fini ();
+  static_glib_funcs.free ();
 }
 #endif
 

diff --git a/src/hb-icu.cc b/src/hb-icu.cc
index 99e3d2c..0442d92 100644 (file)
--- a/src/hb-icu.cc
+++ b/src/hb-icu.cc
@@ -373,7 +373,7 @@ static struct hb_icu_unicode_funcs_lazy_loader_t : hb_unicode_funcs_lazy_loader_
 static
 void free_static_icu_funcs (void)
 {
-  static_icu_funcs.fini ();
+  static_icu_funcs.free ();
 }
 #endif
 

diff --git a/src/hb-machinery-private.hh b/src/hb-machinery-private.hh
index b26ca71..6221fe5 100644 (file)
--- a/src/hb-machinery-private.hh
+++ b/src/hb-machinery-private.hh
@@ -628,6 +628,10 @@ struct hb_lazy_loader_t : hb_data_wrapper_t<Data, WheresData>
   inline void init (void) { instance.set_relaxed (nullptr); }
   inline void fini (void)
   {
+    do_destroy (instance.get ());
+  }
+  inline void free (void)
+  {
   retry:
     Stored *p = instance.get ();
     if (unlikely (p && !this->instance.cmpexch (p, nullptr)))

diff --git a/src/hb-ot-font.cc b/src/hb-ot-font.cc
index 1fb18c4..f181b07 100644 (file)
--- a/src/hb-ot-font.cc
+++ b/src/hb-ot-font.cc
@@ -264,7 +264,7 @@ static struct hb_ot_font_funcs_lazy_loader_t : hb_font_funcs_lazy_loader_t<hb_ot
 static
 void free_static_ot_funcs (void)
 {
-  static_ot_funcs.fini ();
+  static_ot_funcs.free ();
 }
 #endif
 

diff --git a/src/hb-ucdn.cc b/src/hb-ucdn.cc
index c58db05..1945a1c 100644 (file)
--- a/src/hb-ucdn.cc
+++ b/src/hb-ucdn.cc
@@ -267,7 +267,7 @@ static struct hb_ucdn_unicode_funcs_lazy_loader_t : hb_unicode_funcs_lazy_loader
 static
 void free_static_ucdn_funcs (void)
 {
-  static_ucdn_funcs.fini ();
+  static_ucdn_funcs.free ();
 }
 #endif