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

Bug 23336 - unable to display bitmap-only (SFNT) TrueType or OpenType 

Force to find out a size for bitmap-only ttf to avoid the blank glyphs
in the font.

Patch from Bug Fly
This commit is contained in:
Akira TAGOH 2012-03-07 17:32:14 +09:00
parent a13d518fdd
commit 1f01c4b60c
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/fcfreetype.c
View File

@ -2513,31 +2513,27 @@ FcFreeTypeCharSetAndSpacing (FT_Face face, FcBlanks *blanks, int *spacing)
{ {
FcCharSet *cs; FcCharSet *cs;
cs = FcFreeTypeCharSetAndSpacingForSize (face, blanks, spacing, -1);
/* /*
* Check for bitmap-only ttf fonts that are missing the glyf table. * Check for bitmap-only ttf fonts that are missing the glyf table.
* In that case, pick a size and look for glyphs in that size instead * In that case, pick a size and look for glyphs in that size instead
*/ */
if (FcCharSetCount (cs) == 0) if (!(face->face_flags & FT_FACE_FLAG_SCALABLE) &&
face->num_fixed_sizes > 0 &&
FT_Get_Sfnt_Table (face, ft_sfnt_head))
{ {
/* Check for non-scalable TT fonts */ FT_Int strike_index = 0;
if (!(face->face_flags & FT_FACE_FLAG_SCALABLE) && int i;
face->num_fixed_sizes > 0 &&
FT_Get_Sfnt_Table (face, ft_sfnt_head))
{
FT_Int strike_index = 0;
int i;
/* Select the face closest to 16 pixels tall */ /* Select the face closest to 16 pixels tall */
for (i = 1; i < face->num_fixed_sizes; i++) { for (i = 1; i < face->num_fixed_sizes; i++) {
if (abs (face->available_sizes[i].height - 16) < if (abs (face->available_sizes[i].height - 16) <
abs (face->available_sizes[strike_index].height - 16)) abs (face->available_sizes[strike_index].height - 16))
strike_index = i; strike_index = i;
}
FcCharSetDestroy (cs);
cs = FcFreeTypeCharSetAndSpacingForSize (face, blanks, spacing, strike_index);
} }
cs = FcFreeTypeCharSetAndSpacingForSize (face, blanks, spacing, strike_index);
} }
else
cs = FcFreeTypeCharSetAndSpacingForSize (face, blanks, spacing, -1);
return cs; return cs;
} }