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

Merge pull request #74556 from AThousandShips/text_adv_svg_freetype

Browse Source 
[TextServer] Make sure Freetype is enabled for ot-svg
This commit is contained in:
Yuri Sizov
2023-03-15 15:04:01 +01:00
committed by GitHub
parent 1514b9be68 3a5d7a4b54
commit b5845f87fc
6 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/text_server_adv/text_server_adv.cpp
View File

@@ -73,8 +73,10 @@ using namespace godot;
#endif #endif
#ifdef MODULE_SVG_ENABLED #ifdef MODULE_SVG_ENABLED
#ifdef MODULE_FREETYPE_ENABLED
#include "thorvg_svg_in_ot.h" #include "thorvg_svg_in_ot.h"
#endif #endif
#endif
/*************************************************************************/ /*************************************************************************/
/* bmp_font_t HarfBuzz Bitmap font interface */ /* bmp_font_t HarfBuzz Bitmap font interface */

4
modules/text_server_adv/thorvg_svg_in_ot.cpp
View File

@@ -49,10 +49,11 @@ using namespace godot;
#include "core/typedefs.h" #include "core/typedefs.h"
#include "core/variant/variant.h" #include "core/variant/variant.h"
#include "modules/modules_enabled.gen.h" // For svg. #include "modules/modules_enabled.gen.h" // For svg, freetype.
#endif #endif
#ifdef MODULE_SVG_ENABLED #ifdef MODULE_SVG_ENABLED
#ifdef MODULE_FREETYPE_ENABLED
#include "thorvg_bounds_iterator.h" #include "thorvg_bounds_iterator.h"
#include "thorvg_svg_in_ot.h" #include "thorvg_svg_in_ot.h"
@@ -284,4 +285,5 @@ SVG_RendererHooks *get_tvg_svg_in_ot_hooks() {
return &tvg_svg_in_ot_hooks; return &tvg_svg_in_ot_hooks;
} }
#endif // MODULE_FREETYPE_ENABLED
#endif // MODULE_SVG_ENABLED #endif // MODULE_SVG_ENABLED

4
modules/text_server_adv/thorvg_svg_in_ot.h
View File

@@ -47,10 +47,11 @@ using namespace godot;
#include "core/templates/hash_map.h" #include "core/templates/hash_map.h"
#include "core/typedefs.h" #include "core/typedefs.h"
#include "modules/modules_enabled.gen.h" // For svg. #include "modules/modules_enabled.gen.h" // For svg, freetype.
#endif #endif
#ifdef MODULE_SVG_ENABLED #ifdef MODULE_SVG_ENABLED
#ifdef MODULE_FREETYPE_ENABLED
#include <freetype/freetype.h> #include <freetype/freetype.h>
#include <freetype/otsvg.h> #include <freetype/otsvg.h>
@@ -81,6 +82,7 @@ FT_Error tvg_svg_in_ot_render(FT_GlyphSlot p_slot, FT_Pointer *p_state);
SVG_RendererHooks *get_tvg_svg_in_ot_hooks(); SVG_RendererHooks *get_tvg_svg_in_ot_hooks();
#endif // MODULE_FREETYPE_ENABLED
#endif // MODULE_SVG_ENABLED #endif // MODULE_SVG_ENABLED
#endif // THORVG_SVG_IN_OT_H #endif // THORVG_SVG_IN_OT_H

2
modules/text_server_fb/text_server_fb.cpp
View File

@@ -66,8 +66,10 @@ using namespace godot;
#endif #endif
#ifdef MODULE_SVG_ENABLED #ifdef MODULE_SVG_ENABLED
#ifdef MODULE_FREETYPE_ENABLED
#include "thorvg_svg_in_ot.h" #include "thorvg_svg_in_ot.h"
#endif #endif
#endif
/*************************************************************************/ /*************************************************************************/

2
modules/text_server_fb/thorvg_svg_in_ot.cpp
View File

@@ -53,6 +53,7 @@ using namespace godot;
#endif #endif
#ifdef MODULE_SVG_ENABLED #ifdef MODULE_SVG_ENABLED
#ifdef MODULE_FREETYPE_ENABLED
#include "thorvg_bounds_iterator.h" #include "thorvg_bounds_iterator.h"
#include "thorvg_svg_in_ot.h" #include "thorvg_svg_in_ot.h"
@@ -284,4 +285,5 @@ SVG_RendererHooks *get_tvg_svg_in_ot_hooks() {
return &tvg_svg_in_ot_hooks; return &tvg_svg_in_ot_hooks;
} }
#endif // MODULE_FREETYPE_ENABLED
#endif // MODULE_SVG_ENABLED #endif // MODULE_SVG_ENABLED

4
modules/text_server_fb/thorvg_svg_in_ot.h
View File

@@ -47,10 +47,11 @@ using namespace godot;
#include "core/templates/hash_map.h" #include "core/templates/hash_map.h"
#include "core/typedefs.h" #include "core/typedefs.h"
#include "modules/modules_enabled.gen.h" // For svg. #include "modules/modules_enabled.gen.h" // For svg, freetype.
#endif #endif
#ifdef MODULE_SVG_ENABLED #ifdef MODULE_SVG_ENABLED
#ifdef MODULE_FREETYPE_ENABLED
#include <freetype/freetype.h> #include <freetype/freetype.h>
#include <freetype/otsvg.h> #include <freetype/otsvg.h>
@@ -81,6 +82,7 @@ FT_Error tvg_svg_in_ot_render(FT_GlyphSlot p_slot, FT_Pointer *p_state);
SVG_RendererHooks *get_tvg_svg_in_ot_hooks(); SVG_RendererHooks *get_tvg_svg_in_ot_hooks();
#endif // MODULE_FREETYPE_ENABLED
#endif // MODULE_SVG_ENABLED #endif // MODULE_SVG_ENABLED
#endif // THORVG_SVG_IN_OT_H #endif // THORVG_SVG_IN_OT_H