diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-08-04 09:12:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-04 09:12:05 +0200 |
| commit | fdceece7f801f08634e524edea1f4e1bbe149b94 (patch) | |
| tree | 300a6c49bfb063f8a9cb1f19896e363e08687623 /thirdparty/harfbuzz/src/hb-cplusplus.hh | |
| parent | a1d4cf68980cb683f901ddf8130af1d8b398d522 (diff) | |
| parent | 2980c0d60cb067d7958abe5924be5c455b4adba3 (diff) | |
Merge pull request #63899 from bruvzg/hb_510
HarfBuzz: Update to version 5.1.0, use new FLAG_SAFE_TO_INSERT_TATWEEL flag to improve justification.
Diffstat (limited to 'thirdparty/harfbuzz/src/hb-cplusplus.hh')
| -rw-r--r-- | thirdparty/harfbuzz/src/hb-cplusplus.hh | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/thirdparty/harfbuzz/src/hb-cplusplus.hh b/thirdparty/harfbuzz/src/hb-cplusplus.hh index f06a32d912..c4d9d29e23 100644 --- a/thirdparty/harfbuzz/src/hb-cplusplus.hh +++ b/thirdparty/harfbuzz/src/hb-cplusplus.hh @@ -130,7 +130,7 @@ template <typename T, void *, hb_destroy_func_t, hb_bool_t), - void * (*_get_user_data) (T *, + void * (*_get_user_data) (const T *, hb_user_data_key_t *)> struct vtable_t { @@ -164,6 +164,27 @@ HB_DEFINE_VTABLE (unicode_funcs); #undef HB_DEFINE_VTABLE +#ifdef HB_SUBSET_H + +#define HB_DEFINE_VTABLE(name) \ + template<> \ + struct vtable<hb_##name##_t> \ + : vtable_t<hb_##name##_t, \ + nullptr, \ + &hb_##name##_reference, \ + &hb_##name##_destroy, \ + &hb_##name##_set_user_data, \ + &hb_##name##_get_user_data> {} + + +HB_DEFINE_VTABLE (subset_input); +HB_DEFINE_VTABLE (subset_plan); + +#undef HB_DEFINE_VTABLE + +#endif + + } // namespace hb /* Workaround for GCC < 7, see: |