godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #83827 from bruvzg/icu_data_keep

Browse Source 
[TextServerAdvanced] Keep dynamically loaded ICU data in memory.
This commit is contained in:
Rémi Verschelde 2023-10-23 12:44:02 +02:00
commit c21c2706ad
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/text_server_adv/text_server_adv.cpp
View File

@ -338,6 +338,7 @@ _FORCE_INLINE_ bool is_connected_to_prev(char32_t p_chr, char32_t p_pchr) {
/*************************************************************************/ /*************************************************************************/
bool TextServerAdvanced::icu_data_loaded = false; bool TextServerAdvanced::icu_data_loaded = false;
PackedByteArray TextServerAdvanced::icu_data;
bool TextServerAdvanced::_has_feature(Feature p_feature) const { bool TextServerAdvanced::_has_feature(Feature p_feature) const {
switch (p_feature) { switch (p_feature) {
@ -438,7 +439,7 @@ bool TextServerAdvanced::_load_support_data(const String &p_filename) {
return false; return false;
} }
uint64_t len = f->get_length(); uint64_t len = f->get_length();
PackedByteArray icu_data = f->get_buffer(len); icu_data = f->get_buffer(len);
UErrorCode err = U_ZERO_ERROR; UErrorCode err = U_ZERO_ERROR;
udata_setCommonData(icu_data.ptr(), &err); udata_setCommonData(icu_data.ptr(), &err);
@ -476,10 +477,10 @@ bool TextServerAdvanced::_save_support_data(const String &p_filename) const {
return false; return false;
} }
PackedByteArray icu_data; PackedByteArray icu_data_static;
icu_data.resize(U_ICUDATA_SIZE); icu_data_static.resize(U_ICUDATA_SIZE);
memcpy(icu_data.ptrw(), U_ICUDATA_ENTRY_POINT, U_ICUDATA_SIZE); memcpy(icu_data_static.ptrw(), U_ICUDATA_ENTRY_POINT, U_ICUDATA_SIZE);
f->store_buffer(icu_data); f->store_buffer(icu_data_static);
return true; return true;
#else #else

1
modules/text_server_adv/text_server_adv.h
View File

@ -158,6 +158,7 @@ class TextServerAdvanced : public TextServerExtension {
// ICU support data. // ICU support data.
static bool icu_data_loaded; static bool icu_data_loaded;
static PackedByteArray icu_data;
mutable USet *allowed = nullptr; mutable USet *allowed = nullptr;
mutable USpoofChecker *sc_spoof = nullptr; mutable USpoofChecker *sc_spoof = nullptr;
mutable USpoofChecker *sc_conf = nullptr; mutable USpoofChecker *sc_conf = nullptr;