diff options
Diffstat (limited to 'modules/text_server_fb/text_server_fb.cpp')
| -rw-r--r-- | modules/text_server_fb/text_server_fb.cpp | 34 |
1 files changed, 30 insertions, 4 deletions
diff --git a/modules/text_server_fb/text_server_fb.cpp b/modules/text_server_fb/text_server_fb.cpp index 540ba19cac..ce95622f09 100644 --- a/modules/text_server_fb/text_server_fb.cpp +++ b/modules/text_server_fb/text_server_fb.cpp @@ -791,7 +791,7 @@ _FORCE_INLINE_ bool TextServerFallback::_ensure_glyph(FontFallback *p_font_data, return false; } -_FORCE_INLINE_ bool TextServerFallback::_ensure_cache_for_size(FontFallback *p_font_data, const Vector2i &p_size, FontForSizeFallback *&r_cache_for_size) const { +_FORCE_INLINE_ bool TextServerFallback::_ensure_cache_for_size(FontFallback *p_font_data, const Vector2i &p_size, FontForSizeFallback *&r_cache_for_size, bool p_silent) const { ERR_FAIL_COND_V(p_size.x <= 0, false); HashMap<Vector2i, FontForSizeFallback *>::Iterator E = p_font_data->cache.find(p_size); @@ -813,7 +813,11 @@ _FORCE_INLINE_ bool TextServerFallback::_ensure_cache_for_size(FontFallback *p_f error = FT_Init_FreeType(&ft_library); if (error != 0) { memdelete(fd); - ERR_FAIL_V_MSG(false, "FreeType: Error initializing library: '" + String(FT_Error_String(error)) + "'."); + if (p_silent) { + return false; + } else { + ERR_FAIL_V_MSG(false, "FreeType: Error initializing library: '" + String(FT_Error_String(error)) + "'."); + } } #ifdef MODULE_SVG_ENABLED FT_Property_Set(ft_library, "ot-svg", "svg-hooks", get_tvg_svg_in_ot_hooks()); @@ -847,7 +851,11 @@ _FORCE_INLINE_ bool TextServerFallback::_ensure_cache_for_size(FontFallback *p_f FT_Done_Face(fd->face); fd->face = nullptr; memdelete(fd); - ERR_FAIL_V_MSG(false, "FreeType: Error loading font: '" + String(FT_Error_String(error)) + "'."); + if (p_silent) { + return false; + } else { + ERR_FAIL_V_MSG(false, "FreeType: Error loading font: '" + String(FT_Error_String(error)) + "'."); + } } } @@ -980,7 +988,11 @@ _FORCE_INLINE_ bool TextServerFallback::_ensure_cache_for_size(FontFallback *p_f } #else memdelete(fd); - ERR_FAIL_V_MSG(false, "FreeType: Can't load dynamic font, engine is compiled without FreeType support!"); + if (p_silent) { + return false; + } else { + ERR_FAIL_V_MSG(false, "FreeType: Can't load dynamic font, engine is compiled without FreeType support!"); + } #endif } @@ -989,6 +1001,16 @@ _FORCE_INLINE_ bool TextServerFallback::_ensure_cache_for_size(FontFallback *p_f return true; } +_FORCE_INLINE_ bool TextServerFallback::_font_validate(const RID &p_font_rid) const { + FontFallback *fd = _get_font_data(p_font_rid); + ERR_FAIL_NULL_V(fd, false); + + MutexLock lock(fd->mutex); + Vector2i size = _get_size(fd, 16); + FontForSizeFallback *ffsd = nullptr; + return _ensure_cache_for_size(fd, size, ffsd, true); +} + _FORCE_INLINE_ void TextServerFallback::_font_clear_cache(FontFallback *p_font_data) { MutexLock ftlock(ft_mutex); @@ -3920,6 +3942,10 @@ RID TextServerFallback::_find_sys_font_for_text(const RID &p_fdef, const String SystemFontCacheRec sysf; sysf.rid = _create_font(); _font_set_data_ptr(sysf.rid, font_data.ptr(), font_data.size()); + if (!_font_validate(sysf.rid)) { + _free_rid(sysf.rid); + continue; + } Dictionary var = dvar; // Select matching style from collection. |