walkero
/
fontconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bug 50525 - superfluous whitespace in the style

This commit is contained in:
Akira TAGOH 2012-06-08 19:41:59 +09:00
parent f4103bf708
commit cf70eaa3bf
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/fcfreetype.c
View File

@ -1179,10 +1179,11 @@ FcFreeTypeQueryFace (const FT_Face face,
for (snamei = 0; snamei < snamec; snamei++) for (snamei = 0; snamei < snamec; snamei++)
{ {
FcChar8 *utf8; FcChar8 *utf8, *pp;
const FcChar8 *lang; const FcChar8 *lang;
const char *elt = 0, *eltlang = 0; const char *elt = 0, *eltlang = 0;
int *np = 0, *nlangp = 0; int *np = 0, *nlangp = 0;
size_t len;
if (FT_Get_Sfnt_Name (face, snamei, &sname) != 0) if (FT_Get_Sfnt_Name (face, snamei, &sname) != 0)
continue; continue;
@ -1253,6 +1254,18 @@ FcFreeTypeQueryFace (const FT_Face face,
#endif #endif
case TT_NAME_ID_PREFERRED_SUBFAMILY: case TT_NAME_ID_PREFERRED_SUBFAMILY:
case TT_NAME_ID_FONT_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) if (FcDebug () & FC_DBG_SCANV)
printf ("found style (n %2d p %d e %d l 0x%04x) %s\n", printf ("found style (n %2d p %d e %d l 0x%04x) %s\n",
sname.name_id, sname.platform_id, sname.name_id, sname.platform_id,