archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

BLF: Fix FT_Get_Advance Wrong Value Without Size

Browse Source 
Fix possibility of getting invalid fixed-pitch advance size.

See D15735 for more details.

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

Own Code.
This commit is contained in:
Harley Acheson
2022-08-19 17:16:22 -07:00
parent 3a1ae5a02a
commit acf083a5bf
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/blenfont/intern/blf_glyph.c
View File

@@ -96,6 +96,8 @@ static GlyphCacheBLF *blf_glyph_cache_new(FontBLF *font)
memset(gc->glyph_ascii_table, 0, sizeof(gc->glyph_ascii_table)); memset(gc->glyph_ascii_table, 0, sizeof(gc->glyph_ascii_table));
memset(gc->bucket, 0, sizeof(gc->bucket)); memset(gc->bucket, 0, sizeof(gc->bucket));
blf_ensure_size(font);
/* Determine ideal fixed-width size for monospaced output. */ /* Determine ideal fixed-width size for monospaced output. */
FT_UInt gindex = blf_get_char_index(font, U'0'); FT_UInt gindex = blf_get_char_index(font, U'0');
if (gindex && font->face) { if (gindex && font->face) {
@@ -106,7 +108,6 @@ static GlyphCacheBLF *blf_glyph_cache_new(FontBLF *font)
} }
else { else {
/* Font does not have a face or does not contain "0" so use CSS fallback of 1/2 of em. */ /* Font does not have a face or does not contain "0" so use CSS fallback of 1/2 of em. */
blf_ensure_size(font);
gc->fixed_width = (int)((font->ft_size->metrics.height / 2) >> 6); gc->fixed_width = (int)((font->ft_size->metrics.height / 2) >> 6);
} }
if (gc->fixed_width < 1) { if (gc->fixed_width < 1) {