griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix #137365: Do Not Return .notdef for Text Object Control Characters

Browse Source 
For Text Objects make sure we don't render a glyph for tab or other
control characters. Return nothing for carriage return and line feed,
and treat the others as a space character.

Pull Request: https://projects.blender.org/blender/blender/pulls/137374
This commit is contained in:
Harley Acheson
2025-04-12 02:43:00 +02:00
committed by Harley Acheson
parent 3bf92a6e83
commit 3f36ce297a
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/blenfont/intern/blf_glyph.cc
View File

@@ -1842,10 +1842,18 @@ static void blf_glyph_to_curves(const FT_Outline &ftoutline,
MEM_freeN(onpoints);
}
static FT_GlyphSlot blf_glyphslot_ensure_outline(FontBLF *font,
const uint charcode,
bool use_fallback)
static FT_GlyphSlot blf_glyphslot_ensure_outline(FontBLF *font, uint charcode, bool use_fallback)
{
if (charcode < 32) {
if (ELEM(charcode, 0x10, 0x13)) {
/* Do not render line feed or carriage return. #134972. */
return nullptr;
}
/* Other C0 controls (U+0000 - U+001F) can show as space. #135421. */
/* TODO: Return all but TAB as ".notdef" character when we have our own. */
charcode = ' ';
}
/* Glyph might not come from the initial font. */
FontBLF *font_with_glyph = font;
FT_UInt glyph_index = use_fallback ? blf_glyph_index_from_charcode(&font_with_glyph, charcode) :