Replace character discovery loop with simpler, faster version.
The existing loop for discovering which characters map to glyphs is ugly and inefficient. The replacement is functionally identical, but far cleaner and faster.
This commit is contained in:
parent
8d779ce4b3
commit
31e0f03210
|
@ -2584,32 +2584,12 @@ FcFreeTypeCharSetAndSpacing (FT_Face face, FcBlanks *blanks, int *spacing)
|
|||
}
|
||||
else
|
||||
{
|
||||
FT_UInt gindex;
|
||||
|
||||
/*
|
||||
* Find the first encoded character in the font
|
||||
*/
|
||||
if (FT_Get_Char_Index (face, 0))
|
||||
page = ~0;
|
||||
leaf = NULL;
|
||||
ucs4 = FT_Get_First_Char (face, &glyph);
|
||||
while (glyph != 0)
|
||||
{
|
||||
ucs4 = 0;
|
||||
gindex = 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
ucs4 = FT_Get_Next_Char (face, 0, &gindex);
|
||||
if (!ucs4)
|
||||
gindex = 0;
|
||||
}
|
||||
|
||||
while (gindex)
|
||||
{
|
||||
page = ucs4 >> 8;
|
||||
leaf = 0;
|
||||
while ((ucs4 >> 8) == page)
|
||||
{
|
||||
glyph = FT_Get_Char_Index (face, ucs4);
|
||||
if (glyph && FcFreeTypeCheckGlyph (face, ucs4,
|
||||
glyph, blanks, &advance))
|
||||
if (FcFreeTypeCheckGlyph (face, ucs4, glyph, blanks, &advance))
|
||||
{
|
||||
if (advance)
|
||||
{
|
||||
|
@ -2631,8 +2611,9 @@ FcFreeTypeCharSetAndSpacing (FT_Face face, FcBlanks *blanks, int *spacing)
|
|||
}
|
||||
}
|
||||
|
||||
if (!leaf)
|
||||
if ((ucs4 >> 8) != page)
|
||||
{
|
||||
page = (ucs4 >> 8);
|
||||
leaf = FcCharSetFindLeafCreate (fcs, ucs4);
|
||||
if (!leaf)
|
||||
goto bail1;
|
||||
|
@ -2644,11 +2625,7 @@ FcFreeTypeCharSetAndSpacing (FT_Face face, FcBlanks *blanks, int *spacing)
|
|||
font_max = ucs4;
|
||||
#endif
|
||||
}
|
||||
ucs4++;
|
||||
}
|
||||
ucs4 = FT_Get_Next_Char (face, ucs4 - 1, &gindex);
|
||||
if (!ucs4)
|
||||
gindex = 0;
|
||||
ucs4 = FT_Get_Next_Char (face, ucs4, &glyph);
|
||||
}
|
||||
#ifdef CHECK
|
||||
for (ucs4 = 0; ucs4 < 0x10000; ucs4++)
|
||||
|
|
Loading…
Reference in New Issue