diff options
author | marha <marha@users.sourceforge.net> | 2014-09-21 18:14:18 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2014-09-21 18:14:18 +0200 |
commit | 4e080e0165d18887e2a0fccd7f30cf20fd04b178 (patch) | |
tree | dbefa5addb60abe7a5c52dbc1daea7d6e0c9d4d0 /libXfont/src/FreeType/fttools.c | |
parent | e16399e57caac9e859a7d28921c73ef9839b571e (diff) | |
parent | d0f70707dde032e662dbd5bc70df6ac915403abe (diff) | |
download | vcxsrv-4e080e0165d18887e2a0fccd7f30cf20fd04b178.tar.gz vcxsrv-4e080e0165d18887e2a0fccd7f30cf20fd04b178.tar.bz2 vcxsrv-4e080e0165d18887e2a0fccd7f30cf20fd04b178.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
libXfont/src/fontfile/fontfile.c
libXfont/src/util/utilbitmap.c
Diffstat (limited to 'libXfont/src/FreeType/fttools.c')
-rw-r--r-- | libXfont/src/FreeType/fttools.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libXfont/src/FreeType/fttools.c b/libXfont/src/FreeType/fttools.c index a0e34d021..a85d3ee72 100644 --- a/libXfont/src/FreeType/fttools.c +++ b/libXfont/src/FreeType/fttools.c @@ -119,17 +119,17 @@ FTGetName(FT_Face face, int nid, int pid, int eid, FT_SfntName *name_return) return 0; } -int +int FTGetEnglishName(FT_Face face, int nid, char *name_return, int name_len) { FT_SfntName name; int len; - if(FTGetName(face, nid, + if(FTGetName(face, nid, TT_PLATFORM_MICROSOFT, TT_MS_ID_UNICODE_CS, &name) || - FTGetName(face, nid, + FTGetName(face, nid, TT_PLATFORM_APPLE_UNICODE, -1, &name)) - return FTu2a(name.string_len, name.string, name_return, + return FTu2a(name.string_len, name.string, name_return, MSBFirst, name_len); /* Pretend that Apple Roman is ISO 8859-1. */ |