From db4804690b84985b62941833175dd6b540d4cb0f Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 2 May 2019 10:52:53 +1000 Subject: BLF: pass code-point to BLF_has_glyph Avoid BLF having to be concerned with decoding the string (which can fail). Also remove redundant extra zero byte from strings. --- source/blender/blenfont/intern/blf.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'source/blender/blenfont/intern/blf.c') diff --git a/source/blender/blenfont/intern/blf.c b/source/blender/blenfont/intern/blf.c index 17799aea14d..793e9805899 100644 --- a/source/blender/blenfont/intern/blf.c +++ b/source/blender/blenfont/intern/blf.c @@ -41,7 +41,6 @@ #include "DNA_vec_types.h" #include "BLI_math.h" -#include "BLI_string_utf8.h" #include "BLI_threads.h" #include "BLF_api.h" @@ -189,11 +188,10 @@ int BLF_default(void) return global_font_default; } -bool BLF_has_glyph(int fontid, const char *utf8) +bool BLF_has_glyph(int fontid, unsigned int unicode) { FontBLF *font = blf_get(fontid); if (font) { - unsigned int unicode = BLI_str_utf8_as_unicode(utf8); return FT_Get_Char_Index(font->face, unicode) != 0; } return false; -- cgit v1.2.3