asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #78543 from 3dnikita/fix-svg-in-ot-tag-closing

Browse source 
Fix SVG tag closing for OT font glyphs
This commit is contained in:
Rémi Verschelde 2023-06-22 18:31:14 +02:00
commit 18bc912bc0
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
modules/text_server_adv/thorvg_svg_in_ot.cpp
View file

@ -121,7 +121,12 @@ FT_Error tvg_svg_in_ot_preset_slot(FT_GlyphSlot p_slot, FT_Bool p_cache, FT_Poin
for (int i = 0; i < parser->get_attribute_count(); i++) { for (int i = 0; i < parser->get_attribute_count(); i++) {
xml_body += vformat(" %s=\"%s\"", parser->get_attribute_name(i), parser->get_attribute_value(i)); xml_body += vformat(" %s=\"%s\"", parser->get_attribute_name(i), parser->get_attribute_value(i));
} }
xml_body += ">";
if (parser->is_empty()) {
xml_body += "/>";
} else {
xml_body += ">";
}
} else if (parser->get_node_type() == XMLParser::NODE_TEXT) { } else if (parser->get_node_type() == XMLParser::NODE_TEXT) {
xml_body += parser->get_node_data(); xml_body += parser->get_node_data();
} else if (parser->get_node_type() == XMLParser::NODE_ELEMENT_END) { } else if (parser->get_node_type() == XMLParser::NODE_ELEMENT_END) {

7
modules/text_server_fb/thorvg_svg_in_ot.cpp
View file

@ -121,7 +121,12 @@ FT_Error tvg_svg_in_ot_preset_slot(FT_GlyphSlot p_slot, FT_Bool p_cache, FT_Poin
for (int i = 0; i < parser->get_attribute_count(); i++) { for (int i = 0; i < parser->get_attribute_count(); i++) {
xml_body += vformat(" %s=\"%s\"", parser->get_attribute_name(i), parser->get_attribute_value(i)); xml_body += vformat(" %s=\"%s\"", parser->get_attribute_name(i), parser->get_attribute_value(i));
} }
xml_body += ">";
if (parser->is_empty()) {
xml_body += "/>";
} else {
xml_body += ">";
}
} else if (parser->get_node_type() == XMLParser::NODE_TEXT) { } else if (parser->get_node_type() == XMLParser::NODE_TEXT) {
xml_body += parser->get_node_data(); xml_body += parser->get_node_data();
} else if (parser->get_node_type() == XMLParser::NODE_ELEMENT_END) { } else if (parser->get_node_type() == XMLParser::NODE_ELEMENT_END) {