diff options
| author | marha <marha@users.sourceforge.net> | 2012-06-11 08:22:24 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-06-11 08:22:24 +0200 |
| commit | 080d1527a5358dd66ac927acbe0ec61cba7aa7e1 (patch) | |
| tree | 6d54a6409a4627162bddaad63186327e1ecdbad1 /fontconfig/src/fcfreetype.c | |
| parent | 990bc3f015a4f8fce2eb918375defcd44980a845 (diff) | |
| download | vcxsrv-080d1527a5358dd66ac927acbe0ec61cba7aa7e1.tar.gz vcxsrv-080d1527a5358dd66ac927acbe0ec61cba7aa7e1.tar.bz2 vcxsrv-080d1527a5358dd66ac927acbe0ec61cba7aa7e1.zip | |
fontconfig glproto mesa pixman git update 11 Jun 2012
Diffstat (limited to 'fontconfig/src/fcfreetype.c')
| -rw-r--r-- | fontconfig/src/fcfreetype.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/fontconfig/src/fcfreetype.c b/fontconfig/src/fcfreetype.c index ce7dc836c..fb2b0f2f9 100644 --- a/fontconfig/src/fcfreetype.c +++ b/fontconfig/src/fcfreetype.c @@ -1179,10 +1179,11 @@ FcFreeTypeQueryFace (const FT_Face face, for (snamei = 0; snamei < snamec; snamei++) { - FcChar8 *utf8; + FcChar8 *utf8, *pp; const FcChar8 *lang; const char *elt = 0, *eltlang = 0; int *np = 0, *nlangp = 0; + size_t len; if (FT_Get_Sfnt_Name (face, snamei, &sname) != 0) continue; @@ -1253,6 +1254,18 @@ FcFreeTypeQueryFace (const FT_Face face, #endif case TT_NAME_ID_PREFERRED_SUBFAMILY: case TT_NAME_ID_FONT_SUBFAMILY: + if (utf8) + { + pp = utf8; + while (*pp == ' ') + pp++; + len = strlen ((const char *) pp); + memmove (utf8, pp, len + 1); + pp = utf8 + len - 1; + while (*pp == ' ') + pp--; + *(pp + 1) = 0; + } if (FcDebug () & FC_DBG_SCANV) printf ("found style (n %2d p %d e %d l 0x%04x) %s\n", sname.name_id, sname.platform_id, |