mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Fix font collector crash

Browse source 
Originally committed to SVN as r4823.
This commit is contained in:
Thomas Goyne 2010-10-20 01:56:28 +00:00
parent 7189dfb1a1
commit 4af788be1a
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
aegisub/src/font_file_lister_fontconfig.cpp
View file

@ -70,7 +70,7 @@ wxArrayString FontConfigFontFileLister::DoGetFilesWithFace(wxString facename) {
if (FcPatternGetString(final, FC_FILE, 0, &filename) == FcResultMatch && FcPatternGetInteger(final, FC_INDEX, 0, &fontindex) == FcResultMatch) { if (FcPatternGetString(final, FC_FILE, 0, &filename) == FcResultMatch && FcPatternGetInteger(final, FC_INDEX, 0, &fontindex) == FcResultMatch) {
FcPatternGetString(final, FC_FAMILY, fontindex, &gotfamily); FcPatternGetString(final, FC_FAMILY, fontindex, &gotfamily);
if (strcmp((const char*)gotfamily,buffer) == 0) { if (strcmp((const char*)gotfamily,buffer) == 0) {
results.Add(wxString((char*) filename,csConvLocal)); results.Add(wxString((char*) filename));
} }
} }
FcPatternDestroy(final); FcPatternDestroy(final);

2
aegisub/src/font_file_lister_freetype.cpp
View file

@ -93,7 +93,7 @@ wxArrayString GetName(FT_Face &face,int id) {
memcpy(str,name.string,name.string_len); memcpy(str,name.string,name.string_len);
str[name.string_len] = 0; str[name.string_len] = 0;
str[name.string_len+1] = 0; str[name.string_len+1] = 0;
if (name.encoding_id == 0) final.Add(wxString(str, csConvLocal)); if (name.encoding_id == 0) final.Add(wxString(str));
else if (name.encoding_id == 1) { else if (name.encoding_id == 1) {
wxMBConvUTF16BE conv; wxMBConvUTF16BE conv;
wxString string(str,conv); wxString string(str,conv);