godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

[TextServer] Fix use of find_char in text servers

Browse Source 
The `find_char` method is not (currently) available to extensions and
can't be used in the text servers which can be built as extensions, so
now controlled by compile option
This commit is contained in:
AThousandShips
2024-12-18 10:31:06 -05:00
parent 89001f91d2
commit 15b4331fb1
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/text_server_adv/thorvg_svg_in_ot.cpp
View File

@@ -175,7 +175,11 @@ FT_Error tvg_svg_in_ot_preset_slot(FT_GlyphSlot p_slot, FT_Bool p_cache, FT_Poin
if (parser->has_attribute("id")) { if (parser->has_attribute("id")) {
const String &gl_name = parser->get_named_attribute_value("id"); const String &gl_name = parser->get_named_attribute_value("id");
if (gl_name.begins_with("glyph")) { if (gl_name.begins_with("glyph")) {
#ifdef GDEXTENSION
int dot_pos = gl_name.find(".");
#else
int dot_pos = gl_name.find_char('.'); int dot_pos = gl_name.find_char('.');
#endif // GDEXTENSION
int64_t gl_idx = gl_name.substr(5, (dot_pos > 0) ? dot_pos - 5 : -1).to_int(); int64_t gl_idx = gl_name.substr(5, (dot_pos > 0) ? dot_pos - 5 : -1).to_int();
TVG_NodeCache node_cache = TVG_NodeCache(); TVG_NodeCache node_cache = TVG_NodeCache();

4
modules/text_server_fb/thorvg_svg_in_ot.cpp
View File

@@ -175,7 +175,11 @@ FT_Error tvg_svg_in_ot_preset_slot(FT_GlyphSlot p_slot, FT_Bool p_cache, FT_Poin
if (parser->has_attribute("id")) { if (parser->has_attribute("id")) {
const String &gl_name = parser->get_named_attribute_value("id"); const String &gl_name = parser->get_named_attribute_value("id");
if (gl_name.begins_with("glyph")) { if (gl_name.begins_with("glyph")) {
#ifdef GDEXTENSION
int dot_pos = gl_name.find(".");
#else
int dot_pos = gl_name.find_char('.'); int dot_pos = gl_name.find_char('.');
#endif // GDEXTENSION
int64_t gl_idx = gl_name.substr(5, (dot_pos > 0) ? dot_pos - 5 : -1).to_int(); int64_t gl_idx = gl_name.substr(5, (dot_pos > 0) ? dot_pos - 5 : -1).to_int();
TVG_NodeCache node_cache = TVG_NodeCache(); TVG_NodeCache node_cache = TVG_NodeCache();