godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Merge pull request #107079 from bruvzg/svg_comp_glyph_fix 

[SVG in OT] Fix rendering of some glyphs using "defs" with "#glyphXXXXX.X" id.
This commit is contained in:
Thaddeus Crews 2025-06-03 15:30:20 -05:00
parent 757cf4c8d5 e928b2a5e5
commit 153a06aefe
No known key found for this signature in database
GPG Key ID: 8C6E5FEB5FC03CCC
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/text_server_adv/thorvg_svg_in_ot.cpp
View File

@ -170,8 +170,14 @@ FT_Error tvg_svg_in_ot_preset_slot(FT_GlyphSlot p_slot, FT_Bool p_cache, FT_Poin
String *p_xml = &xml_body_temp;
int64_t tag_count = -1;
bool is_in_defs = false;
while (parser->read() == OK) {
if (parser->has_attribute("id")) {
if (parser->get_node_type() == XMLParser::NODE_ELEMENT && parser->get_node_name().to_lower() == "defs") {
is_in_defs = true;
} else if (parser->get_node_type() == XMLParser::NODE_ELEMENT_END && parser->get_node_name().to_lower() == "defs") {
is_in_defs = false;
}
if (!is_in_defs && parser->has_attribute("id")) {
const String &gl_name = parser->get_named_attribute_value("id");
if (gl_name.begins_with("glyph")) {
#ifdef GDEXTENSION

8
modules/text_server_fb/thorvg_svg_in_ot.cpp
View File

@ -170,8 +170,14 @@ FT_Error tvg_svg_in_ot_preset_slot(FT_GlyphSlot p_slot, FT_Bool p_cache, FT_Poin
String *p_xml = &xml_body_temp;
int64_t tag_count = -1;
bool is_in_defs = false;
while (parser->read() == OK) {
if (parser->has_attribute("id")) {
if (parser->get_node_type() == XMLParser::NODE_ELEMENT && parser->get_node_name().to_lower() == "defs") {
is_in_defs = true;
} else if (parser->get_node_type() == XMLParser::NODE_ELEMENT_END && parser->get_node_name().to_lower() == "defs") {
is_in_defs = false;
}
if (!is_in_defs && parser->has_attribute("id")) {
const String &gl_name = parser->get_named_attribute_value("id");
if (gl_name.begins_with("glyph")) {
#ifdef GDEXTENSION