commit f06ab8a4262c759b4723614fd28f55ee77aa8466
author Behdad Esfahbod <behdad@behdad.org> Tue Jun 05 12:31:51 2012 -0400
committer Behdad Esfahbod <behdad@behdad.org> Tue Jun 05 14:49:14 2012 -0400
tree be463572fd6ebe73bc42ae79ed8aece7c685d38a
parent bf93b636c4963cbc32d5fba7ace1053db6719192

Better hide nil objects and make them const

src/hb-ft.cc

diff --git a/src/hb-ft.cc b/src/hb-ft.cc
index 90adc0d..aa09bd7 100644
--- a/src/hb-ft.cc
+++ b/src/hb-ft.cc
@@ -271,22 +271,22 @@
 }
 
 
-static hb_font_funcs_t ft_ffuncs = {
-  HB_OBJECT_HEADER_STATIC,
-
-  TRUE, /* immutable */
-
-  {
-#define HB_FONT_FUNC_IMPLEMENT(name) hb_ft_get_##name,
-    HB_FONT_FUNCS_IMPLEMENT_CALLBACKS
-#undef HB_FONT_FUNC_IMPLEMENT
-  }
-};
-
 static hb_font_funcs_t *
 _hb_ft_get_font_funcs (void)
 {
-  return &ft_ffuncs;
+  static const hb_font_funcs_t ft_ffuncs = {
+    HB_OBJECT_HEADER_STATIC,
+
+    TRUE, /* immutable */
+
+    {
+#define HB_FONT_FUNC_IMPLEMENT(name) hb_ft_get_##name,
+      HB_FONT_FUNCS_IMPLEMENT_CALLBACKS
+#undef HB_FONT_FUNC_IMPLEMENT
+    }
+  };
+
+  return const_cast<hb_font_funcs_t *> (&ft_ffuncs);
 }
 
 
@@ -398,26 +398,21 @@
 }
 
 
-
-
-static FT_Library ft_library;
-static hb_bool_t ft_library_initialized;
-static struct ft_library_destructor {
-  ~ft_library_destructor (void) {
-    if (ft_library)
-      FT_Done_FreeType (ft_library);
-  }
-} static_ft_library_destructor;
-
 static FT_Library
 _get_ft_library (void)
 {
-  if (unlikely (!ft_library_initialized)) {
-    FT_Init_FreeType (&ft_library);
-    ft_library_initialized = TRUE;
-  }
+  static struct ft_library_singleton
+  {
+    ft_library_singleton (void) {
+      FT_Init_FreeType (&ft_library);
+    }
+    ~ft_library_singleton (void) {
+      FT_Done_FreeType (ft_library);
+    }
+    FT_Library ft_library;
+  } ft_library_singleton;
 
-  return ft_library;
+  return ft_library_singleton.ft_library;
 }
 
 static void