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.

2 files changed, 3 insertions, 5 deletions

diff --git a/source/blender/blenfont/BLF_api.h b/source/blender/blenfont/BLF_api.h
index 359ec9cc49e..448bb0d621a 100644
--- a/source/blender/blenfont/BLF_api.h
+++ b/source/blender/blenfont/BLF_api.h
@@ -53,8 +53,8 @@ int BLF_load_mem_unique(const char *name, const unsigned char *mem, int mem_size
 void BLF_unload(const char *name) ATTR_NONNULL();
 void BLF_unload_id(int fontid);
 
-/* Check if font supports a particular glyph */
-bool BLF_has_glyph(int fontid, const char *utf8);
+/* Check if font supports a particular glyph. */
+bool BLF_has_glyph(int fontid, unsigned int unicode);
 
 /* Attach a file with metrics information from memory. */
 void BLF_metrics_attach(int fontid, unsigned char *mem, int mem_size);
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;