Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use String::resize() and CharString in text_server_adv again #80642

Merged
merged 1 commit into from
Aug 16, 2023
Merged

Use String::resize() and CharString in text_server_adv again #80642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions modules/text_server_adv/text_server_adv.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2113,12 +2113,10 @@ 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;
// @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);
text.resize(text_size);
hb_ot_name_get_utf32(hb_face, names[i].name_id, names[i].language, &text_size, (uint32_t *)text.ptrw());
if (!text.is_empty()) {
Dictionary &id_string = names_for_lang[String(hb_language_to_string(names[i].language))];
id_string[name] = text;
Expand Down
15 changes: 0 additions & 15 deletions modules/text_server_adv/thorvg_svg_in_ot.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,21 +155,10 @@ FT_Error tvg_svg_in_ot_preset_slot(FT_GlyphSlot p_slot, FT_Bool p_cache, FT_Poin
}

String xml_code_str = "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"" + rtos(min_x) + " " + rtos(min_y) + " " + rtos(new_w) + " " + rtos(new_h) + "\">" + xml_body;
#ifndef GDEXTENSION
gl_state.xml_code = xml_code_str.utf8();
#else
CharString xml_code = xml_code_str.utf8();
gl_state.xml_code_length = xml_code.length();
gl_state.xml_code = memnew_arr(char, gl_state.xml_code_length);
memcpy(gl_state.xml_code, xml_code.get_data(), gl_state.xml_code_length);
#endif

picture = tvg::Picture::gen();
#ifndef GDEXTENSION
result = picture->load(gl_state.xml_code.get_data(), gl_state.xml_code.length(), "svg+xml", false);
#else
result = picture->load(gl_state.xml_code, gl_state.xml_code_length, "svg+xml", false);
#endif
if (result != tvg::Result::Success) {
ERR_FAIL_V_MSG(FT_Err_Invalid_SVG_Document, "Failed to load SVG document (glyph metrics).");
}
Expand Down Expand Up @@ -257,11 +246,7 @@ FT_Error tvg_svg_in_ot_render(FT_GlyphSlot p_slot, FT_Pointer *p_state) {
ERR_FAIL_COND_V_MSG(!gl_state.ready, FT_Err_Invalid_SVG_Document, "SVG glyph not ready.");

std::unique_ptr<tvg::Picture> picture = tvg::Picture::gen();
#ifndef GDEXTENSION
tvg::Result res = picture->load(gl_state.xml_code.get_data(), gl_state.xml_code.length(), "svg+xml", false);
#else
tvg::Result res = picture->load(gl_state.xml_code, gl_state.xml_code_length, "svg+xml", false);
#endif
if (res != tvg::Result::Success) {
ERR_FAIL_V_MSG(FT_Err_Invalid_SVG_Document, "Failed to load SVG document (glyph rendering).");
}
Expand Down
14 changes: 0 additions & 14 deletions modules/text_server_adv/thorvg_svg_in_ot.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,22 +66,8 @@ struct GL_State {
float y = 0;
float w = 0;
float h = 0;
#ifndef GDEXTENSION
CharString xml_code;
#else
// @todo After godot-cpp#1142 is fixed, use CharString just like when compiled as a Godot module.
char *xml_code = nullptr;
int xml_code_length = 0;
#endif
tvg::Matrix m;

#ifdef GDEXTENSION
~GL_State() {
if (xml_code) {
memdelete_arr(xml_code);
}
}
#endif
};

struct TVG_State {
Expand Down
Loading