walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Properly remove deprecated stuff

This commit is contained in:
Behdad Esfahbod 2018-10-09 00:56:33 -04:00
parent fc50916589
commit a52bc039c3
3 changed files with 18 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/hb-glib.cc
View File

@ -30,7 +30,6 @@
#include "hb-glib.h" #include "hb-glib.h"
#include "hb-unicode.hh"
#include "hb-machinery.hh" #include "hb-machinery.hh"
@ -202,8 +201,6 @@ hb_glib_unicode_combining_class (hb_unicode_funcs_t *ufuncs HB_UNUSED,
return (hb_unicode_combining_class_t) g_unichar_combining_class (unicode); return (hb_unicode_combining_class_t) g_unichar_combining_class (unicode);
} }
#define hb_glib_unicode_eastasian_width nullptr
static hb_unicode_general_category_t static hb_unicode_general_category_t
hb_glib_unicode_general_category (hb_unicode_funcs_t *ufuncs HB_UNUSED, hb_glib_unicode_general_category (hb_unicode_funcs_t *ufuncs HB_UNUSED,
hb_codepoint_t unicode, hb_codepoint_t unicode,
@ -328,8 +325,6 @@ hb_glib_unicode_decompose (hb_unicode_funcs_t *ufuncs HB_UNUSED,
return ret; return ret;
} }
#define hb_glib_unicode_decompose_compatibility nullptr
#ifdef HB_USE_ATEXIT #ifdef HB_USE_ATEXIT
static void free_static_glib_funcs (void); static void free_static_glib_funcs (void);
@ -341,10 +336,12 @@ static struct hb_glib_unicode_funcs_lazy_loader_t : hb_unicode_funcs_lazy_loader
{ {
hb_unicode_funcs_t *funcs = hb_unicode_funcs_create (nullptr); hb_unicode_funcs_t *funcs = hb_unicode_funcs_create (nullptr);
#define HB_UNICODE_FUNC_IMPLEMENT(name) \ hb_unicode_funcs_set_combining_class_func (funcs, hb_glib_unicode_combining_class, nullptr, nullptr);
hb_unicode_funcs_set_##name##_func (funcs, hb_glib_unicode_##name, nullptr, nullptr); hb_unicode_funcs_set_general_category_func (funcs, hb_glib_unicode_general_category, nullptr, nullptr);
HB_UNICODE_FUNCS_IMPLEMENT_CALLBACKS hb_unicode_funcs_set_mirroring_func (funcs, hb_glib_unicode_mirroring, nullptr, nullptr);
#undef HB_UNICODE_FUNC_IMPLEMENT hb_unicode_funcs_set_script_func (funcs, hb_glib_unicode_script, nullptr, nullptr);
hb_unicode_funcs_set_compose_func (funcs, hb_glib_unicode_compose, nullptr, nullptr);
hb_unicode_funcs_set_decompose_func (funcs, hb_glib_unicode_decompose, nullptr, nullptr);
hb_unicode_funcs_make_immutable (funcs); hb_unicode_funcs_make_immutable (funcs);

15
src/hb-icu.cc
View File

@ -31,7 +31,6 @@
#include "hb-icu.h" #include "hb-icu.h"
#include "hb-unicode.hh"
#include "hb-machinery.hh" #include "hb-machinery.hh"
#include <unicode/uchar.h> #include <unicode/uchar.h>
@ -73,8 +72,6 @@ hb_icu_unicode_combining_class (hb_unicode_funcs_t *ufuncs HB_UNUSED,
return (hb_unicode_combining_class_t) u_getCombiningClass (unicode); return (hb_unicode_combining_class_t) u_getCombiningClass (unicode);
} }
#define hb_icu_unicode_eastasian_width nullptr
static hb_unicode_general_category_t static hb_unicode_general_category_t
hb_icu_unicode_general_category (hb_unicode_funcs_t *ufuncs HB_UNUSED, hb_icu_unicode_general_category (hb_unicode_funcs_t *ufuncs HB_UNUSED,
hb_codepoint_t unicode, hb_codepoint_t unicode,
@ -292,8 +289,6 @@ hb_icu_unicode_decompose (hb_unicode_funcs_t *ufuncs HB_UNUSED,
return ret; return ret;
} }
#define hb_icu_unicode_decompose_compatibility nullptr
#ifdef HB_USE_ATEXIT #ifdef HB_USE_ATEXIT
static void free_static_icu_funcs (void); static void free_static_icu_funcs (void);
@ -312,10 +307,12 @@ static struct hb_icu_unicode_funcs_lazy_loader_t : hb_unicode_funcs_lazy_loader_
hb_unicode_funcs_t *funcs = hb_unicode_funcs_create (nullptr); hb_unicode_funcs_t *funcs = hb_unicode_funcs_create (nullptr);
#define HB_UNICODE_FUNC_IMPLEMENT(name) \ hb_unicode_funcs_set_combining_class_func (funcs, hb_icu_unicode_combining_class, nullptr, nullptr);
hb_unicode_funcs_set_##name##_func (funcs, hb_icu_unicode_##name, user_data, nullptr); hb_unicode_funcs_set_general_category_func (funcs, hb_icu_unicode_general_category, nullptr, nullptr);
HB_UNICODE_FUNCS_IMPLEMENT_CALLBACKS hb_unicode_funcs_set_mirroring_func (funcs, hb_icu_unicode_mirroring, nullptr, nullptr);
#undef HB_UNICODE_FUNC_IMPLEMENT hb_unicode_funcs_set_script_func (funcs, hb_icu_unicode_script, nullptr, nullptr);
hb_unicode_funcs_set_compose_func (funcs, hb_icu_unicode_compose, nullptr, nullptr);
hb_unicode_funcs_set_decompose_func (funcs, hb_icu_unicode_decompose, nullptr, nullptr);
hb_unicode_funcs_make_immutable (funcs); hb_unicode_funcs_make_immutable (funcs);

15
src/hb-ucdn.cc
View File

@ -16,7 +16,6 @@
#include "hb.hh" #include "hb.hh"
#include "hb-unicode.hh"
#include "hb-machinery.hh" #include "hb-machinery.hh"
#include "ucdn.h" #include "ucdn.h"
@ -182,8 +181,6 @@ hb_ucdn_combining_class(hb_unicode_funcs_t *ufuncs HB_UNUSED,
return (hb_unicode_combining_class_t) ucdn_get_combining_class(unicode); return (hb_unicode_combining_class_t) ucdn_get_combining_class(unicode);
} }
#define hb_ucdn_eastasian_width nullptr
static hb_unicode_general_category_t static hb_unicode_general_category_t
hb_ucdn_general_category(hb_unicode_funcs_t *ufuncs HB_UNUSED, hb_ucdn_general_category(hb_unicode_funcs_t *ufuncs HB_UNUSED,
hb_codepoint_t unicode, hb_codepoint_t unicode,
@ -224,8 +221,6 @@ hb_ucdn_decompose(hb_unicode_funcs_t *ufuncs HB_UNUSED,
return ucdn_decompose(ab, a, b); return ucdn_decompose(ab, a, b);
} }
#define hb_ucdn_decompose_compatibility nullptr
#ifdef HB_USE_ATEXIT #ifdef HB_USE_ATEXIT
static void free_static_ucdn_funcs (void); static void free_static_ucdn_funcs (void);
@ -237,10 +232,12 @@ static struct hb_ucdn_unicode_funcs_lazy_loader_t : hb_unicode_funcs_lazy_loader
{ {
hb_unicode_funcs_t *funcs = hb_unicode_funcs_create (nullptr); hb_unicode_funcs_t *funcs = hb_unicode_funcs_create (nullptr);
#define HB_UNICODE_FUNC_IMPLEMENT(name) \ hb_unicode_funcs_set_combining_class_func (funcs, hb_ucdn_combining_class, nullptr, nullptr);
hb_unicode_funcs_set_##name##_func (funcs, hb_ucdn_##name, nullptr, nullptr); hb_unicode_funcs_set_general_category_func (funcs, hb_ucdn_general_category, nullptr, nullptr);
HB_UNICODE_FUNCS_IMPLEMENT_CALLBACKS hb_unicode_funcs_set_mirroring_func (funcs, hb_ucdn_mirroring, nullptr, nullptr);
#undef HB_UNICODE_FUNC_IMPLEMENT hb_unicode_funcs_set_script_func (funcs, hb_ucdn_script, nullptr, nullptr);
hb_unicode_funcs_set_compose_func (funcs, hb_ucdn_compose, nullptr, nullptr);
hb_unicode_funcs_set_decompose_func (funcs, hb_ucdn_decompose, nullptr, nullptr);
hb_unicode_funcs_make_immutable (funcs); hb_unicode_funcs_make_immutable (funcs);