blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 776 Projects 19 Wiki Activity

VFont: Refactor of check_freetypefont() 

Refactor of our Vfont check for font validity.

See D12068 for further details.

Differential Revision: https://developer.blender.org/D12068

Reviewed by Campbell Barton
This commit is contained in:
Harley Acheson 2021-09-10 09:30:21 -07:00
parent e2f99c338b
commit 6b7b4f8e57
1 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
source/blender/blenlib/intern/freetypefont.c
View File

@ -369,36 +369,28 @@ static VFontData *objfnt_to_ftvfontdata(PackedFile *pf)
return vfd;
}
static int check_freetypefont(PackedFile *pf)
static bool check_freetypefont(PackedFile *pf)
{
FT_Face face;
FT_GlyphSlot glyph;
FT_UInt glyph_index;
int success = 0;
FT_Face face = NULL;
FT_UInt glyph_index = 0;
bool success = false;
err = FT_New_Memory_Face(library, pf->data, pf->size, 0, &face);
if (err) {
success = 0;
return false;
// XXX error("This is not a valid font");
}
else {
glyph_index = FT_Get_Char_Index(face, 'A');
FT_Get_First_Char(face, &glyph_index);
if (glyph_index) {
err = FT_Load_Glyph(face, glyph_index, FT_LOAD_NO_SCALE | FT_LOAD_NO_BITMAP);
if (err) {
success = 0;
}
else {
glyph = face->glyph;
if (glyph->format == ft_glyph_format_outline) {
success = 1;
}
else {
// XXX error("Selected Font has no outline data");
success = 0;
}
if (!err) {
success = (face->glyph->format == ft_glyph_format_outline);
}
}
FT_Done_Face(face);
return success;
}
@ -413,7 +405,6 @@ static int check_freetypefont(PackedFile *pf)
VFontData *BLI_vfontdata_from_freetypefont(PackedFile *pf)
{
VFontData *vfd = NULL;
int success = 0;
/* init Freetype */
err = FT_Init_FreeType(&library);
@ -422,9 +413,7 @@ VFontData *BLI_vfontdata_from_freetypefont(PackedFile *pf)
return NULL;
}
success = check_freetypefont(pf);
if (success) {
if (check_freetypefont(pf)) {
vfd = objfnt_to_ftvfontdata(pf);
}