mirror of
https://github.com/godotengine/godot
synced 2024-09-05 13:58:34 +00:00
[TextServer] Fix HarfBuzz handle init order. Fix MinGW build.
This commit is contained in:
parent
a160a95ea6
commit
0089adbd30
|
@ -1231,7 +1231,7 @@ _FORCE_INLINE_ bool TextServerAdvanced::_ensure_cache_for_size(FontDataAdvanced
|
|||
int error = 0;
|
||||
if (!library) {
|
||||
error = FT_Init_FreeType(&library);
|
||||
ERR_FAIL_COND_V_MSG(error != 0, false, TTR("FreeType: Error initializing library:") + " '" + String(FT_Error_String(error)) + "'.");
|
||||
ERR_FAIL_COND_V_MSG(error != 0, false, RTR("FreeType: Error initializing library:") + " '" + String(FT_Error_String(error)) + "'.");
|
||||
}
|
||||
|
||||
memset(&fd->stream, 0, sizeof(FT_StreamRec));
|
||||
|
@ -1249,13 +1249,7 @@ _FORCE_INLINE_ bool TextServerAdvanced::_ensure_cache_for_size(FontDataAdvanced
|
|||
if (error) {
|
||||
FT_Done_Face(fd->face);
|
||||
fd->face = nullptr;
|
||||
ERR_FAIL_V_MSG(false, TTR("FreeType: Error loading font:") + " '" + String(FT_Error_String(error)) + "'.");
|
||||
}
|
||||
fd->hb_handle = hb_ft_font_create(fd->face, nullptr);
|
||||
if (fd->hb_handle == nullptr) {
|
||||
FT_Done_Face(fd->face);
|
||||
fd->face = nullptr;
|
||||
ERR_FAIL_V_MSG(false, TTR("HarfBuzz: Error creating FreeType font object."));
|
||||
ERR_FAIL_V_MSG(false, RTR("FreeType: Error loading font:") + " '" + String(FT_Error_String(error)) + "'.");
|
||||
}
|
||||
|
||||
if (p_font_data->msdf) {
|
||||
|
@ -1284,6 +1278,8 @@ _FORCE_INLINE_ bool TextServerAdvanced::_ensure_cache_for_size(FontDataAdvanced
|
|||
FT_Set_Pixel_Sizes(fd->face, 0, fd->size.x * fd->oversampling);
|
||||
}
|
||||
|
||||
fd->hb_handle = hb_ft_font_create(fd->face, nullptr);
|
||||
|
||||
fd->ascent = (fd->face->size->metrics.ascender / 64.0) / fd->oversampling * fd->scale;
|
||||
fd->descent = (-fd->face->size->metrics.descender / 64.0) / fd->oversampling * fd->scale;
|
||||
fd->underline_position = (-FT_MulFix(fd->face->underline_position, fd->face->size->metrics.y_scale) / 64.0) / fd->oversampling * fd->scale;
|
||||
|
@ -1598,14 +1594,11 @@ _FORCE_INLINE_ bool TextServerAdvanced::_ensure_cache_for_size(FontDataAdvanced
|
|||
FT_Done_MM_Var(library, amaster);
|
||||
}
|
||||
#else
|
||||
ERR_FAIL_V_MSG(false, TTR("FreeType: Can't load dynamic font, engine is compiled without FreeType support!");
|
||||
ERR_FAIL_V_MSG(false, RTR("FreeType: Can't load dynamic font, engine is compiled without FreeType support!");
|
||||
#endif
|
||||
} else {
|
||||
// Init bitmap font.
|
||||
fd->hb_handle = hb_bmp_font_create(fd, nullptr);
|
||||
if (!fd->hb_handle) {
|
||||
ERR_FAIL_V_MSG(false, TTR("HarfBuzz: Error creating bitmap font object."));
|
||||
}
|
||||
}
|
||||
p_font_data->cache[p_size] = fd;
|
||||
return true;
|
||||
|
|
|
@ -686,7 +686,7 @@ _FORCE_INLINE_ bool TextServerFallback::_ensure_cache_for_size(FontDataFallback
|
|||
int error = 0;
|
||||
if (!library) {
|
||||
error = FT_Init_FreeType(&library);
|
||||
ERR_FAIL_COND_V_MSG(error != 0, false, TTR("FreeType: Error initializing library:") + " '" + String(FT_Error_String(error)) + "'.");
|
||||
ERR_FAIL_COND_V_MSG(error != 0, false, RTR("FreeType: Error initializing library:") + " '" + String(FT_Error_String(error)) + "'.");
|
||||
}
|
||||
|
||||
memset(&fd->stream, 0, sizeof(FT_StreamRec));
|
||||
|
@ -704,7 +704,7 @@ _FORCE_INLINE_ bool TextServerFallback::_ensure_cache_for_size(FontDataFallback
|
|||
if (error) {
|
||||
FT_Done_Face(fd->face);
|
||||
fd->face = nullptr;
|
||||
ERR_FAIL_V_MSG(false, TTR("FreeType: Error loading font:") + " '" + String(FT_Error_String(error)) + "'.");
|
||||
ERR_FAIL_V_MSG(false, RTR("FreeType: Error loading font:") + " '" + String(FT_Error_String(error)) + "'.");
|
||||
}
|
||||
|
||||
if (p_font_data->msdf) {
|
||||
|
@ -784,7 +784,7 @@ _FORCE_INLINE_ bool TextServerFallback::_ensure_cache_for_size(FontDataFallback
|
|||
FT_Done_MM_Var(library, amaster);
|
||||
}
|
||||
#else
|
||||
ERR_FAIL_V_MSG(false, TTR("FreeType: Can't load dynamic font, engine is compiled without FreeType support!");
|
||||
ERR_FAIL_V_MSG(false, RTR("FreeType: Can't load dynamic font, engine is compiled without FreeType support!");
|
||||
#endif
|
||||
}
|
||||
p_font_data->cache[p_size] = fd;
|
||||
|
|
Loading…
Reference in a new issue