diff options
author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2017-11-13 23:50:36 +0000 |
---|---|---|
committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2017-11-13 23:50:36 +0000 |
commit | 61bfcb5314d6c017378a1dd65e3a419d647caaba (patch) | |
tree | a2999a2d6baafb59e0541f8c99d7b1d4eed2d7f4 /Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ft.cc | |
parent | 736b4d06b8bce87bd0150c28f632e0174597e20b (diff) |
harfbuzz 1.7.0
git-svn-id: svn://tug.org/texlive/trunk@45783 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ft.cc')
-rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ft.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ft.cc b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ft.cc index f578e9dc49b..68c77454716 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ft.cc +++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ft.cc @@ -28,6 +28,7 @@ */ #include "hb-private.hh" +#include "hb-debug.hh" #include "hb-ft.h" @@ -38,12 +39,6 @@ #include FT_TRUETYPE_TABLES_H - -#ifndef HB_DEBUG_FT -#define HB_DEBUG_FT (HB_DEBUG+0) -#endif - - /* TODO: * * In general, this file does a fine job of what it's supposed to do. @@ -428,6 +423,7 @@ static hb_font_funcs_t *static_ft_funcs = nullptr; static void free_static_ft_funcs (void) { + hb_object_undo_inert (static_ft_funcs); hb_font_funcs_destroy (static_ft_funcs); } #endif @@ -458,8 +454,10 @@ retry: hb_font_funcs_set_glyph_from_name_func (funcs, hb_ft_get_glyph_from_name, nullptr, nullptr); hb_font_funcs_make_immutable (funcs); + hb_object_make_inert (funcs); if (!hb_atomic_ptr_cmpexch (&static_ft_funcs, nullptr, funcs)) { + hb_object_undo_inert (funcs); hb_font_funcs_destroy (funcs); goto retry; } |