From 67df761c5142bcd772b8172e6d774e467da1b7d6 Mon Sep 17 00:00:00 2001 From: Rodrigo Braz Monteiro Date: Mon, 14 Jan 2008 07:06:43 +0000 Subject: [PATCH] Something is still broken with unicode conversion but I'll figure that out tomorrow Originally committed to SVN as r1716. --- aegisub/font_file_lister_freetype.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/aegisub/font_file_lister_freetype.cpp b/aegisub/font_file_lister_freetype.cpp index f16ae4ea1..3c3da6c99 100644 --- a/aegisub/font_file_lister_freetype.cpp +++ b/aegisub/font_file_lister_freetype.cpp @@ -75,10 +75,15 @@ wxArrayString GetName(FT_Face &face,int id) { FT_SfntName name; FT_Get_Sfnt_Name(face,i,&name); if (name.name_id == id) { - char *str = new char[name.string_len+1]; + char *str = new char[name.string_len+2]; memcpy(str,name.string,name.string_len); str[name.string_len] = 0; - final.Add(wxString(str, wxConvLocal)); + str[name.string_len+1] = 0; + if (name.encoding_id == 0) final.Add(wxString(str, wxConvLocal)); + else if (name.encoding_id == 1) { + wxMBConvUTF16LE conv; + final.Add(wxString((wxChar*)str,conv)); + } delete [] str; } }