From f83c92d91bcd81c424b3b19626d59025d0959879 Mon Sep 17 00:00:00 2001 From: Vincent Wei Date: Wed, 3 Jun 2020 18:07:26 +0800 Subject: [PATCH] implement hb_ext_unicode_funcs --- src/font/freetype2.c | 6 +++--- src/font/freetype2.h | 2 +- src/font/harzbuff-minigui-funcs.c | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/font/freetype2.c b/src/font/freetype2.c index 1c1a0548..1b3a725f 100644 --- a/src/font/freetype2.c +++ b/src/font/freetype2.c @@ -1217,7 +1217,7 @@ BOOL font_InitFreetypeLibrary (void) goto error_library; } -#ifdef _MGCOMPLEX_SCRIPTS +#if 0 // def _MGCOMPLEX_SCRIPTS __mg_init_harzbuff_funcs(); #endif @@ -1229,7 +1229,7 @@ error_ftc_manager: #endif /* _MGFONT_TTF_CACHE */ -#ifdef _MGCOMPLEX_SCRIPTS +#if 0 // def _MGCOMPLEX_SCRIPTS __mg_init_harzbuff_funcs(); #endif @@ -1258,7 +1258,7 @@ void font_TermFreetypeLibrary (void) FT_DESTROY_LOCK(&ft_lock); -#ifdef _MGCOMPLEX_SCRIPTS +#if 0 // def _MGCOMPLEX_SCRIPTS __mg_term_harzbuff_funcs(); #endif } diff --git a/src/font/freetype2.h b/src/font/freetype2.h index 471cb293..e6c73c97 100644 --- a/src/font/freetype2.h +++ b/src/font/freetype2.h @@ -163,7 +163,7 @@ extern void __mg_ttc_sys_deinit(void); extern TTFCACHEINFO *__mg_ttc_search(HCACHE hCache, Glyph32 gv, int *size); extern void __mg_ttc_refer(HCACHE hCache); -#ifdef _MGCOMPLEX_SCRIPTS +#if 0 // def _MGCOMPLEX_SCRIPTS extern void __mg_init_harzbuff_funcs(void); extern void __mg_term_harzbuff_funcs(void); #endif diff --git a/src/font/harzbuff-minigui-funcs.c b/src/font/harzbuff-minigui-funcs.c index b5d77002..ec14a544 100644 --- a/src/font/harzbuff-minigui-funcs.c +++ b/src/font/harzbuff-minigui-funcs.c @@ -121,7 +121,7 @@ hb_minigui_unicode_decompose (hb_unicode_funcs_t *ufuncs, } static hb_unicode_funcs_t *_funcs; -static hb_unicode_funcs_t *get_unicode_funcs(void) +hb_unicode_funcs_t *hb_ext_get_unicode_funcs(void) { if (_funcs) return _funcs; @@ -146,6 +146,7 @@ static hb_unicode_funcs_t *get_unicode_funcs(void) return _funcs; } +#if 0 typedef hb_unicode_funcs_t *(*hb_get_unicode_funcs) (void); extern hb_get_unicode_funcs __hb_extern_get_unicode_funcs; @@ -167,6 +168,7 @@ void __mg_term_harzbuff_funcs(void) __FUNCTION__); } } +#endif #endif /* defined(_MGCHARSET_UNICODE) && defined(_MGCOMPLEX_SCRIPTS) */