From aeb0d1d8874bfd633aeedf2c039723c2d94d475a Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Sat, 7 Jan 2023 13:12:02 +0000
Subject: [PATCH] Use a more reliable conversion to UTF8.

Fixes https://gitlab.com/kicad/code/kicad/issues/12722

Fixes https://gitlab.com/kicad/code/kicad/issues/13313
---
 common/font/outline_font.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/font/outline_font.cpp b/common/font/outline_font.cpp
index 4ce2d4af52..0feff2a81d 100644
--- a/common/font/outline_font.cpp
+++ b/common/font/outline_font.cpp
@@ -332,7 +332,7 @@ VECTOR2I OUTLINE_FONT::getTextAsGlyphs( BOX2I* aBBox, std::vector<std::unique_pt
     FT_Set_Char_Size( face, 0, scaler, GLYPH_RESOLUTION, 0 );
 
     hb_buffer_t* buf = hb_buffer_create();
-    hb_buffer_add_utf8( buf, aText.c_str(), -1, 0, -1 );
+    hb_buffer_add_utf8( buf, UTF8( aText ).c_str(), -1, 0, -1 );
     hb_buffer_guess_segment_properties( buf );  // guess direction, script, and language based on
                                                 // contents
 
@@ -525,7 +525,7 @@ void OUTLINE_FONT::RenderToOpenGLCanvas( KIGFX::OPENGL_GAL& aGal, const wxString
                                          const EDA_ANGLE& aOrientation, bool aIsMirrored ) const
 {
     hb_buffer_t* buf = hb_buffer_create();
-    hb_buffer_add_utf8( buf, aString.c_str(), -1, 0, -1 );
+    hb_buffer_add_utf8( buf, UTF8( aString ).c_str(), -1, 0, -1 );
     hb_buffer_guess_segment_properties( buf ); // guess direction, script, and language based on contents
 
     unsigned int         glyphCount;