Merge pull request #99459 from bruvzg/svg_font_fix

Fix SVG font rendering.

8 files changed, 125 insertions, 383 deletions

diff --git a/modules/text_server_adv/thorvg_bounds_iterator.cpp b/modules/text_server_adv/thorvg_bounds_iterator.cpp
deleted file mode 100644
index d273eef97f..0000000000
--- a/modules/text_server_adv/thorvg_bounds_iterator.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-/**************************************************************************/
-/*  thorvg_bounds_iterator.cpp                                            */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#ifdef GDEXTENSION
-// Headers for building as GDExtension plug-in.
-
-#include <godot_cpp/godot.hpp>
-
-using namespace godot;
-
-#elif defined(GODOT_MODULE)
-// Headers for building as built-in module.
-
-#include "core/typedefs.h"
-
-#include "modules/modules_enabled.gen.h" // For svg.
-#endif
-
-#ifdef MODULE_SVG_ENABLED
-
-#include "thorvg_bounds_iterator.h"
-
-#include <tvgIteratorAccessor.h>
-#include <tvgPaint.h>
-
-// This function uses private ThorVG API to get bounding box of top level children elements.
-
-void tvg_get_bounds(tvg::Picture *p_picture, float &r_min_x, float &r_min_y, float &r_max_x, float &r_max_y) {
-	tvg::IteratorAccessor itrAccessor;
-	if (tvg::Iterator *it = itrAccessor.iterator(p_picture)) {
-		while (const tvg::Paint *child = it->next()) {
-			float x = 0, y = 0, w = 0, h = 0;
-			child->bounds(&x, &y, &w, &h, true);
-			r_min_x = MIN(x, r_min_x);
-			r_min_y = MIN(y, r_min_y);
-			r_max_x = MAX(x + w, r_max_x);
-			r_max_y = MAX(y + h, r_max_y);
-		}
-		delete (it);
-	}
-}
-
-#endif // MODULE_SVG_ENABLED
diff --git a/modules/text_server_adv/thorvg_bounds_iterator.h b/modules/text_server_adv/thorvg_bounds_iterator.h
deleted file mode 100644
index afa2c13764..0000000000
--- a/modules/text_server_adv/thorvg_bounds_iterator.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/**************************************************************************/
-/*  thorvg_bounds_iterator.h                                              */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#ifndef THORVG_BOUNDS_ITERATOR_H
-#define THORVG_BOUNDS_ITERATOR_H
-
-#ifdef GDEXTENSION
-// Headers for building as GDExtension plug-in.
-
-#include <godot_cpp/core/mutex_lock.hpp>
-#include <godot_cpp/godot.hpp>
-
-using namespace godot;
-
-#elif defined(GODOT_MODULE)
-// Headers for building as built-in module.
-
-#include "core/typedefs.h"
-
-#include "modules/modules_enabled.gen.h" // For svg.
-#endif
-
-#ifdef MODULE_SVG_ENABLED
-
-#include <thorvg.h>
-
-void tvg_get_bounds(tvg::Picture *p_picture, float &r_min_x, float &r_min_y, float &r_max_x, float &r_max_y);
-
-#endif // MODULE_SVG_ENABLED
-
-#endif // THORVG_BOUNDS_ITERATOR_H
diff --git a/modules/text_server_adv/thorvg_svg_in_ot.cpp b/modules/text_server_adv/thorvg_svg_in_ot.cpp
index 136ccf3aaf..f546c5bca6 100644
--- a/modules/text_server_adv/thorvg_svg_in_ot.cpp
+++ b/modules/text_server_adv/thorvg_svg_in_ot.cpp
@@ -57,8 +57,6 @@ using namespace godot;
 
 #include "thorvg_svg_in_ot.h"
 
-#include "thorvg_bounds_iterator.h"
-
 #include <freetype/otsvg.h>
 #include <ft2build.h>
 
@@ -92,8 +90,9 @@ FT_Error tvg_svg_in_ot_preset_slot(FT_GlyphSlot p_slot, FT_Bool p_cache, FT_Poin
 		parser.instantiate();
 		parser->_open_buffer((const uint8_t *)document->svg_document, document->svg_document_length);
 
-		float aspect = 1.0f;
 		String xml_body;
+		double embox_x = document->units_per_EM;
+		double embox_y = document->units_per_EM;
 		while (parser->read() == OK) {
 			if (parser->has_attribute("id")) {
 				const String &gl_name = parser->get_named_attribute_value("id");
@@ -111,15 +110,26 @@ FT_Error tvg_svg_in_ot_preset_slot(FT_GlyphSlot p_slot, FT_Bool p_cache, FT_Poin
 					PackedStringArray vb = parser->get_named_attribute_value("viewBox").split(" ");
 
 					if (vb.size() == 4) {
-						aspect = vb[2].to_float() / vb[3].to_float();
+						embox_x = vb[2].to_float();
+						embox_y = vb[3].to_float();
 					}
 				}
-				continue;
+				if (parser->has_attribute("width")) {
+					embox_x = parser->get_named_attribute_value("width").to_float();
+				}
+				if (parser->has_attribute("height")) {
+					embox_y = parser->get_named_attribute_value("height").to_float();
+				}
 			}
 			if (parser->get_node_type() == XMLParser::NODE_ELEMENT) {
 				xml_body += vformat("<%s", parser->get_node_name());
+				bool is_svg_tag = parser->get_node_name() == "svg";
 				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));
+					String aname = parser->get_attribute_name(i);
+					if (is_svg_tag && (aname == "viewBox" || aname == "width" || aname == "height")) {
+						continue;
+					}
+					xml_body += vformat(" %s=\"%s\"", aname, parser->get_attribute_value(i));
 				}
 
 				if (parser->is_empty()) {
@@ -133,91 +143,78 @@ FT_Error tvg_svg_in_ot_preset_slot(FT_GlyphSlot p_slot, FT_Bool p_cache, FT_Poin
 				xml_body += vformat("</%s>", parser->get_node_name());
 			}
 		}
-		String temp_xml_str = "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 1 1\">" + xml_body;
-		CharString temp_xml = temp_xml_str.utf8();
 
 		std::unique_ptr<tvg::Picture> picture = tvg::Picture::gen();
-		tvg::Result result = picture->load(temp_xml.get_data(), temp_xml.length(), "svg+xml", false);
-		if (result != tvg::Result::Success) {
-			ERR_FAIL_V_MSG(FT_Err_Invalid_SVG_Document, "Failed to load SVG document (bounds detection).");
-		}
-
-		float min_x = INFINITY, min_y = INFINITY, max_x = -INFINITY, max_y = -INFINITY;
-		tvg_get_bounds(picture.get(), min_x, min_y, max_x, max_y);
+		gl_state.xml_code = xml_body.utf8();
 
-		float new_h = (max_y - min_y);
-		float new_w = (max_x - min_x);
-
-		if (new_h * aspect >= new_w) {
-			new_w = (new_h * aspect);
-		} else {
-			new_h = (new_w / aspect);
+		tvg::Result result = picture->load(gl_state.xml_code.get_data(), gl_state.xml_code.length(), "svg+xml", false);
+		if (result != tvg::Result::Success) {
+			ERR_FAIL_V_MSG(FT_Err_Invalid_SVG_Document, "Failed to load SVG document (glyph metrics).");
 		}
 
-		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;
-		gl_state.xml_code = xml_code_str.utf8();
+		float svg_width, svg_height;
+		picture->size(&svg_width, &svg_height);
+		double aspect = svg_width / svg_height;
 
-		picture = tvg::Picture::gen();
-		result = picture->load(gl_state.xml_code.get_data(), gl_state.xml_code.length(), "svg+xml", false);
+		result = picture->size(embox_x * aspect, embox_y);
 		if (result != tvg::Result::Success) {
-			ERR_FAIL_V_MSG(FT_Err_Invalid_SVG_Document, "Failed to load SVG document (glyph metrics).");
+			ERR_FAIL_V_MSG(FT_Err_Invalid_SVG_Document, "Failed to resize SVG document.");
 		}
 
-		float x_svg_to_out, y_svg_to_out;
-		x_svg_to_out = (float)metrics.x_ppem / new_w;
-		y_svg_to_out = (float)metrics.y_ppem / new_h;
+		double x_svg_to_out = (double)metrics.x_ppem / embox_x;
+		double y_svg_to_out = (double)metrics.y_ppem / embox_y;
 
-		gl_state.m.e11 = (double)document->transform.xx / (1 << 16) * x_svg_to_out;
-		gl_state.m.e12 = -(double)document->transform.xy / (1 << 16) * x_svg_to_out;
-		gl_state.m.e21 = -(double)document->transform.yx / (1 << 16) * y_svg_to_out;
-		gl_state.m.e22 = (double)document->transform.yy / (1 << 16) * y_svg_to_out;
-		gl_state.m.e13 = (double)document->delta.x / 64 * new_w / metrics.x_ppem;
-		gl_state.m.e23 = -(double)document->delta.y / 64 * new_h / metrics.y_ppem;
+		gl_state.m.e11 = (double)document->transform.xx / (1 << 16);
+		gl_state.m.e12 = -(double)document->transform.xy / (1 << 16);
+		gl_state.m.e21 = -(double)document->transform.yx / (1 << 16);
+		gl_state.m.e22 = (double)document->transform.yy / (1 << 16);
+		gl_state.m.e13 = (double)document->delta.x / 64 * embox_x / metrics.x_ppem;
+		gl_state.m.e23 = -(double)document->delta.y / 64 * embox_y / metrics.y_ppem;
 		gl_state.m.e31 = 0;
 		gl_state.m.e32 = 0;
 		gl_state.m.e33 = 1;
 
-		result = picture->transform(gl_state.m);
+		result = picture->size(embox_x * aspect * x_svg_to_out, embox_y * y_svg_to_out);
 		if (result != tvg::Result::Success) {
-			ERR_FAIL_V_MSG(FT_Err_Invalid_SVG_Document, "Failed to apply transform to SVG document.");
+			ERR_FAIL_V_MSG(FT_Err_Invalid_SVG_Document, "Failed to resize SVG document.");
 		}
 
-		result = picture->bounds(&gl_state.x, &gl_state.y, &gl_state.w, &gl_state.h, true);
+		result = picture->transform(gl_state.m);
 		if (result != tvg::Result::Success) {
-			ERR_FAIL_V_MSG(FT_Err_Invalid_SVG_Document, "Failed to get SVG bounds.");
+			ERR_FAIL_V_MSG(FT_Err_Invalid_SVG_Document, "Failed to apply transform to SVG document.");
 		}
 
-		gl_state.bmp_y = gl_state.h + metrics.descender / 64.f;
-		gl_state.bmp_x = 0;
+		picture->size(&gl_state.w, &gl_state.h);
+		gl_state.x = (gl_state.h - gl_state.w) / 2.0;
+		gl_state.y = -gl_state.h;
 
 		gl_state.ready = true;
 	}
 
-	p_slot->bitmap_left = (FT_Int)gl_state.bmp_x;
-	p_slot->bitmap_top = (FT_Int)gl_state.bmp_y;
+	p_slot->bitmap_left = (FT_Int)gl_state.x;
+	p_slot->bitmap_top = (FT_Int)-gl_state.y;
 
-	float tmp = ceil(gl_state.h);
-	p_slot->bitmap.rows = (unsigned int)tmp;
-	tmp = ceil(gl_state.w);
-	p_slot->bitmap.width = (unsigned int)tmp;
+	double tmpd = Math::ceil(gl_state.h);
+	p_slot->bitmap.rows = (unsigned int)tmpd;
+	tmpd = Math::ceil(gl_state.w);
+	p_slot->bitmap.width = (unsigned int)tmpd;
 	p_slot->bitmap.pitch = (int)p_slot->bitmap.width * 4;
+
 	p_slot->bitmap.pixel_mode = FT_PIXEL_MODE_BGRA;
 
-	float metrics_width, metrics_height;
-	float horiBearingX, horiBearingY;
-	float vertBearingX, vertBearingY;
+	float metrics_width = (float)gl_state.w;
+	float metrics_height = (float)gl_state.h;
+
+	float horiBearingX = (float)gl_state.x;
+	float horiBearingY = (float)-gl_state.y;
 
-	metrics_width = (float)gl_state.w;
-	metrics_height = (float)gl_state.h;
-	horiBearingX = (float)gl_state.x;
-	horiBearingY = (float)-gl_state.y;
-	vertBearingX = p_slot->metrics.horiBearingX / 64.0f - p_slot->metrics.horiAdvance / 64.0f / 2;
-	vertBearingY = (p_slot->metrics.vertAdvance / 64.0f - p_slot->metrics.height / 64.0f) / 2;
+	float vertBearingX = p_slot->metrics.horiBearingX / 64.0f - p_slot->metrics.horiAdvance / 64.0f / 2;
+	float vertBearingY = (p_slot->metrics.vertAdvance / 64.0f - p_slot->metrics.height / 64.0f) / 2;
 
-	tmp = roundf(metrics_width * 64);
-	p_slot->metrics.width = (FT_Pos)tmp;
-	tmp = roundf(metrics_height * 64);
-	p_slot->metrics.height = (FT_Pos)tmp;
+	float tmpf = Math::round(metrics_width * 64);
+	p_slot->metrics.width = (FT_Pos)tmpf;
+	tmpf = Math::round(metrics_height * 64);
+	p_slot->metrics.height = (FT_Pos)tmpf;
 
 	p_slot->metrics.horiBearingX = (FT_Pos)(horiBearingX * 64);
 	p_slot->metrics.horiBearingY = (FT_Pos)(horiBearingY * 64);
@@ -250,6 +247,10 @@ FT_Error tvg_svg_in_ot_render(FT_GlyphSlot p_slot, FT_Pointer *p_state) {
 	if (res != tvg::Result::Success) {
 		ERR_FAIL_V_MSG(FT_Err_Invalid_SVG_Document, "Failed to load SVG document (glyph rendering).");
 	}
+	res = picture->size(gl_state.w, gl_state.h);
+	if (res != tvg::Result::Success) {
+		ERR_FAIL_V_MSG(FT_Err_Invalid_SVG_Document, "Failed to resize SVG document.");
+	}
 	res = picture->transform(gl_state.m);
 	if (res != tvg::Result::Success) {
 		ERR_FAIL_V_MSG(FT_Err_Invalid_SVG_Document, "Failed to apply transform to SVG document.");
diff --git a/modules/text_server_adv/thorvg_svg_in_ot.h b/modules/text_server_adv/thorvg_svg_in_ot.h
index ce048674fd..a0e7e3a1d2 100644
--- a/modules/text_server_adv/thorvg_svg_in_ot.h
+++ b/modules/text_server_adv/thorvg_svg_in_ot.h
@@ -60,8 +60,6 @@ using namespace godot;
 
 struct GL_State {
 	bool ready = false;
-	float bmp_x = 0;
-	float bmp_y = 0;
 	float x = 0;
 	float y = 0;
 	float w = 0;
diff --git a/modules/text_server_fb/thorvg_bounds_iterator.cpp b/modules/text_server_fb/thorvg_bounds_iterator.cpp
deleted file mode 100644
index d273eef97f..0000000000
--- a/modules/text_server_fb/thorvg_bounds_iterator.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-/**************************************************************************/
-/*  thorvg_bounds_iterator.cpp                                            */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#ifdef GDEXTENSION
-// Headers for building as GDExtension plug-in.
-
-#include <godot_cpp/godot.hpp>
-
-using namespace godot;
-
-#elif defined(GODOT_MODULE)
-// Headers for building as built-in module.
-
-#include "core/typedefs.h"
-
-#include "modules/modules_enabled.gen.h" // For svg.
-#endif
-
-#ifdef MODULE_SVG_ENABLED
-
-#include "thorvg_bounds_iterator.h"
-
-#include <tvgIteratorAccessor.h>
-#include <tvgPaint.h>
-
-// This function uses private ThorVG API to get bounding box of top level children elements.
-
-void tvg_get_bounds(tvg::Picture *p_picture, float &r_min_x, float &r_min_y, float &r_max_x, float &r_max_y) {
-	tvg::IteratorAccessor itrAccessor;
-	if (tvg::Iterator *it = itrAccessor.iterator(p_picture)) {
-		while (const tvg::Paint *child = it->next()) {
-			float x = 0, y = 0, w = 0, h = 0;
-			child->bounds(&x, &y, &w, &h, true);
-			r_min_x = MIN(x, r_min_x);
-			r_min_y = MIN(y, r_min_y);
-			r_max_x = MAX(x + w, r_max_x);
-			r_max_y = MAX(y + h, r_max_y);
-		}
-		delete (it);
-	}
-}
-
-#endif // MODULE_SVG_ENABLED
diff --git a/modules/text_server_fb/thorvg_bounds_iterator.h b/modules/text_server_fb/thorvg_bounds_iterator.h
deleted file mode 100644
index afa2c13764..0000000000
--- a/modules/text_server_fb/thorvg_bounds_iterator.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/**************************************************************************/
-/*  thorvg_bounds_iterator.h                                              */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#ifndef THORVG_BOUNDS_ITERATOR_H
-#define THORVG_BOUNDS_ITERATOR_H
-
-#ifdef GDEXTENSION
-// Headers for building as GDExtension plug-in.
-
-#include <godot_cpp/core/mutex_lock.hpp>
-#include <godot_cpp/godot.hpp>
-
-using namespace godot;
-
-#elif defined(GODOT_MODULE)
-// Headers for building as built-in module.
-
-#include "core/typedefs.h"
-
-#include "modules/modules_enabled.gen.h" // For svg.
-#endif
-
-#ifdef MODULE_SVG_ENABLED
-
-#include <thorvg.h>
-
-void tvg_get_bounds(tvg::Picture *p_picture, float &r_min_x, float &r_min_y, float &r_max_x, float &r_max_y);
-
-#endif // MODULE_SVG_ENABLED
-
-#endif // THORVG_BOUNDS_ITERATOR_H
diff --git a/modules/text_server_fb/thorvg_svg_in_ot.cpp b/modules/text_server_fb/thorvg_svg_in_ot.cpp
index 1ad33a88d4..f546c5bca6 100644
--- a/modules/text_server_fb/thorvg_svg_in_ot.cpp
+++ b/modules/text_server_fb/thorvg_svg_in_ot.cpp
@@ -49,7 +49,7 @@ using namespace godot;
 #include "core/typedefs.h"
 #include "core/variant/variant.h"
 
-#include "modules/modules_enabled.gen.h" // For svg.
+#include "modules/modules_enabled.gen.h" // For svg, freetype.
 #endif
 
 #ifdef MODULE_SVG_ENABLED
@@ -57,8 +57,6 @@ using namespace godot;
 
 #include "thorvg_svg_in_ot.h"
 
-#include "thorvg_bounds_iterator.h"
-
 #include <freetype/otsvg.h>
 #include <ft2build.h>
 
@@ -92,8 +90,9 @@ FT_Error tvg_svg_in_ot_preset_slot(FT_GlyphSlot p_slot, FT_Bool p_cache, FT_Poin
 		parser.instantiate();
 		parser->_open_buffer((const uint8_t *)document->svg_document, document->svg_document_length);
 
-		float aspect = 1.0f;
 		String xml_body;
+		double embox_x = document->units_per_EM;
+		double embox_y = document->units_per_EM;
 		while (parser->read() == OK) {
 			if (parser->has_attribute("id")) {
 				const String &gl_name = parser->get_named_attribute_value("id");
@@ -111,15 +110,26 @@ FT_Error tvg_svg_in_ot_preset_slot(FT_GlyphSlot p_slot, FT_Bool p_cache, FT_Poin
 					PackedStringArray vb = parser->get_named_attribute_value("viewBox").split(" ");
 
 					if (vb.size() == 4) {
-						aspect = vb[2].to_float() / vb[3].to_float();
+						embox_x = vb[2].to_float();
+						embox_y = vb[3].to_float();
 					}
 				}
-				continue;
+				if (parser->has_attribute("width")) {
+					embox_x = parser->get_named_attribute_value("width").to_float();
+				}
+				if (parser->has_attribute("height")) {
+					embox_y = parser->get_named_attribute_value("height").to_float();
+				}
 			}
 			if (parser->get_node_type() == XMLParser::NODE_ELEMENT) {
 				xml_body += vformat("<%s", parser->get_node_name());
+				bool is_svg_tag = parser->get_node_name() == "svg";
 				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));
+					String aname = parser->get_attribute_name(i);
+					if (is_svg_tag && (aname == "viewBox" || aname == "width" || aname == "height")) {
+						continue;
+					}
+					xml_body += vformat(" %s=\"%s\"", aname, parser->get_attribute_value(i));
 				}
 
 				if (parser->is_empty()) {
@@ -133,91 +143,78 @@ FT_Error tvg_svg_in_ot_preset_slot(FT_GlyphSlot p_slot, FT_Bool p_cache, FT_Poin
 				xml_body += vformat("</%s>", parser->get_node_name());
 			}
 		}
-		String temp_xml_str = "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 1 1\">" + xml_body;
-		CharString temp_xml = temp_xml_str.utf8();
 
 		std::unique_ptr<tvg::Picture> picture = tvg::Picture::gen();
-		tvg::Result result = picture->load(temp_xml.get_data(), temp_xml.length(), "svg+xml", false);
-		if (result != tvg::Result::Success) {
-			ERR_FAIL_V_MSG(FT_Err_Invalid_SVG_Document, "Failed to load SVG document (bounds detection).");
-		}
-
-		float min_x = INFINITY, min_y = INFINITY, max_x = -INFINITY, max_y = -INFINITY;
-		tvg_get_bounds(picture.get(), min_x, min_y, max_x, max_y);
+		gl_state.xml_code = xml_body.utf8();
 
-		float new_h = (max_y - min_y);
-		float new_w = (max_x - min_x);
-
-		if (new_h * aspect >= new_w) {
-			new_w = (new_h * aspect);
-		} else {
-			new_h = (new_w / aspect);
+		tvg::Result result = picture->load(gl_state.xml_code.get_data(), gl_state.xml_code.length(), "svg+xml", false);
+		if (result != tvg::Result::Success) {
+			ERR_FAIL_V_MSG(FT_Err_Invalid_SVG_Document, "Failed to load SVG document (glyph metrics).");
 		}
 
-		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;
-		gl_state.xml_code = xml_code_str.utf8();
+		float svg_width, svg_height;
+		picture->size(&svg_width, &svg_height);
+		double aspect = svg_width / svg_height;
 
-		picture = tvg::Picture::gen();
-		result = picture->load(gl_state.xml_code.get_data(), gl_state.xml_code.length(), "svg+xml", false);
+		result = picture->size(embox_x * aspect, embox_y);
 		if (result != tvg::Result::Success) {
-			ERR_FAIL_V_MSG(FT_Err_Invalid_SVG_Document, "Failed to load SVG document (glyph metrics).");
+			ERR_FAIL_V_MSG(FT_Err_Invalid_SVG_Document, "Failed to resize SVG document.");
 		}
 
-		float x_svg_to_out, y_svg_to_out;
-		x_svg_to_out = (float)metrics.x_ppem / new_w;
-		y_svg_to_out = (float)metrics.y_ppem / new_h;
+		double x_svg_to_out = (double)metrics.x_ppem / embox_x;
+		double y_svg_to_out = (double)metrics.y_ppem / embox_y;
 
-		gl_state.m.e11 = (double)document->transform.xx / (1 << 16) * x_svg_to_out;
-		gl_state.m.e12 = -(double)document->transform.xy / (1 << 16) * x_svg_to_out;
-		gl_state.m.e21 = -(double)document->transform.yx / (1 << 16) * y_svg_to_out;
-		gl_state.m.e22 = (double)document->transform.yy / (1 << 16) * y_svg_to_out;
-		gl_state.m.e13 = (double)document->delta.x / 64 * new_w / metrics.x_ppem;
-		gl_state.m.e23 = -(double)document->delta.y / 64 * new_h / metrics.y_ppem;
+		gl_state.m.e11 = (double)document->transform.xx / (1 << 16);
+		gl_state.m.e12 = -(double)document->transform.xy / (1 << 16);
+		gl_state.m.e21 = -(double)document->transform.yx / (1 << 16);
+		gl_state.m.e22 = (double)document->transform.yy / (1 << 16);
+		gl_state.m.e13 = (double)document->delta.x / 64 * embox_x / metrics.x_ppem;
+		gl_state.m.e23 = -(double)document->delta.y / 64 * embox_y / metrics.y_ppem;
 		gl_state.m.e31 = 0;
 		gl_state.m.e32 = 0;
 		gl_state.m.e33 = 1;
 
-		result = picture->transform(gl_state.m);
+		result = picture->size(embox_x * aspect * x_svg_to_out, embox_y * y_svg_to_out);
 		if (result != tvg::Result::Success) {
-			ERR_FAIL_V_MSG(FT_Err_Invalid_SVG_Document, "Failed to apply transform to SVG document.");
+			ERR_FAIL_V_MSG(FT_Err_Invalid_SVG_Document, "Failed to resize SVG document.");
 		}
 
-		result = picture->bounds(&gl_state.x, &gl_state.y, &gl_state.w, &gl_state.h, true);
+		result = picture->transform(gl_state.m);
 		if (result != tvg::Result::Success) {
-			ERR_FAIL_V_MSG(FT_Err_Invalid_SVG_Document, "Failed to get SVG bounds.");
+			ERR_FAIL_V_MSG(FT_Err_Invalid_SVG_Document, "Failed to apply transform to SVG document.");
 		}
 
-		gl_state.bmp_y = gl_state.h + metrics.descender / 64.f;
-		gl_state.bmp_x = 0;
+		picture->size(&gl_state.w, &gl_state.h);
+		gl_state.x = (gl_state.h - gl_state.w) / 2.0;
+		gl_state.y = -gl_state.h;
 
 		gl_state.ready = true;
 	}
 
-	p_slot->bitmap_left = (FT_Int)gl_state.bmp_x;
-	p_slot->bitmap_top = (FT_Int)gl_state.bmp_y;
+	p_slot->bitmap_left = (FT_Int)gl_state.x;
+	p_slot->bitmap_top = (FT_Int)-gl_state.y;
 
-	float tmp = ceil(gl_state.h);
-	p_slot->bitmap.rows = (unsigned int)tmp;
-	tmp = ceil(gl_state.w);
-	p_slot->bitmap.width = (unsigned int)tmp;
+	double tmpd = Math::ceil(gl_state.h);
+	p_slot->bitmap.rows = (unsigned int)tmpd;
+	tmpd = Math::ceil(gl_state.w);
+	p_slot->bitmap.width = (unsigned int)tmpd;
 	p_slot->bitmap.pitch = (int)p_slot->bitmap.width * 4;
+
 	p_slot->bitmap.pixel_mode = FT_PIXEL_MODE_BGRA;
 
-	float metrics_width, metrics_height;
-	float horiBearingX, horiBearingY;
-	float vertBearingX, vertBearingY;
+	float metrics_width = (float)gl_state.w;
+	float metrics_height = (float)gl_state.h;
+
+	float horiBearingX = (float)gl_state.x;
+	float horiBearingY = (float)-gl_state.y;
 
-	metrics_width = (float)gl_state.w;
-	metrics_height = (float)gl_state.h;
-	horiBearingX = (float)gl_state.x;
-	horiBearingY = (float)-gl_state.y;
-	vertBearingX = p_slot->metrics.horiBearingX / 64.0f - p_slot->metrics.horiAdvance / 64.0f / 2;
-	vertBearingY = (p_slot->metrics.vertAdvance / 64.0f - p_slot->metrics.height / 64.0f) / 2;
+	float vertBearingX = p_slot->metrics.horiBearingX / 64.0f - p_slot->metrics.horiAdvance / 64.0f / 2;
+	float vertBearingY = (p_slot->metrics.vertAdvance / 64.0f - p_slot->metrics.height / 64.0f) / 2;
 
-	tmp = roundf(metrics_width * 64);
-	p_slot->metrics.width = (FT_Pos)tmp;
-	tmp = roundf(metrics_height * 64);
-	p_slot->metrics.height = (FT_Pos)tmp;
+	float tmpf = Math::round(metrics_width * 64);
+	p_slot->metrics.width = (FT_Pos)tmpf;
+	tmpf = Math::round(metrics_height * 64);
+	p_slot->metrics.height = (FT_Pos)tmpf;
 
 	p_slot->metrics.horiBearingX = (FT_Pos)(horiBearingX * 64);
 	p_slot->metrics.horiBearingY = (FT_Pos)(horiBearingY * 64);
@@ -250,6 +247,10 @@ FT_Error tvg_svg_in_ot_render(FT_GlyphSlot p_slot, FT_Pointer *p_state) {
 	if (res != tvg::Result::Success) {
 		ERR_FAIL_V_MSG(FT_Err_Invalid_SVG_Document, "Failed to load SVG document (glyph rendering).");
 	}
+	res = picture->size(gl_state.w, gl_state.h);
+	if (res != tvg::Result::Success) {
+		ERR_FAIL_V_MSG(FT_Err_Invalid_SVG_Document, "Failed to resize SVG document.");
+	}
 	res = picture->transform(gl_state.m);
 	if (res != tvg::Result::Success) {
 		ERR_FAIL_V_MSG(FT_Err_Invalid_SVG_Document, "Failed to apply transform to SVG document.");
diff --git a/modules/text_server_fb/thorvg_svg_in_ot.h b/modules/text_server_fb/thorvg_svg_in_ot.h
index ce048674fd..a0e7e3a1d2 100644
--- a/modules/text_server_fb/thorvg_svg_in_ot.h
+++ b/modules/text_server_fb/thorvg_svg_in_ot.h
@@ -60,8 +60,6 @@ using namespace godot;
 
 struct GL_State {
 	bool ready = false;
-	float bmp_x = 0;
-	float bmp_y = 0;
 	float x = 0;
 	float y = 0;
 	float w = 0;