diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-06-23 17:23:29 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-06-23 17:23:29 +0200 |
| commit | 731df52084bc909cef9b4dcab6eaaf10c2282922 (patch) | |
| tree | 01d1aea6c6856927c2e75912c512d85e98339deb /modules/text_server_adv/text_server_adv.cpp | |
| parent | 9ab388c146895cfacf87d09d28c148e186f348b6 (diff) | |
| parent | 263c909349cb64d988bba26eb62c01a3a0b19791 (diff) | |
| download | redot-engine-731df52084bc909cef9b4dcab6eaaf10c2282922.tar.gz | |
Merge pull request #77532 from dsnopek/text_server_adv_gdextension
Fix text_server_adv compiling as a GDExtension
Diffstat (limited to 'modules/text_server_adv/text_server_adv.cpp')
| -rw-r--r-- | modules/text_server_adv/text_server_adv.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/modules/text_server_adv/text_server_adv.cpp b/modules/text_server_adv/text_server_adv.cpp index eb0cb54caf..b8010e6692 100644 --- a/modules/text_server_adv/text_server_adv.cpp +++ b/modules/text_server_adv/text_server_adv.cpp @@ -2112,10 +2112,12 @@ Dictionary TextServerAdvanced::_font_get_ot_name_strings(const RID &p_font_rid) name = vformat("unknown_%d", names[i].name_id); } break; } - String text; unsigned int text_size = hb_ot_name_get_utf32(hb_face, names[i].name_id, names[i].language, nullptr, nullptr) + 1; - text.resize(text_size); - hb_ot_name_get_utf32(hb_face, names[i].name_id, names[i].language, &text_size, (uint32_t *)text.ptrw()); + // @todo After godot-cpp#1141 is fixed, use text.resize() and write directly to text.wptr() instead of using a temporary buffer. + char32_t *buffer = memnew_arr(char32_t, text_size); + hb_ot_name_get_utf32(hb_face, names[i].name_id, names[i].language, &text_size, (uint32_t *)buffer); + String text(buffer); + memdelete_arr(buffer); if (!text.is_empty()) { Dictionary &id_string = names_for_lang[String(hb_language_to_string(names[i].language))]; id_string[name] = text; |