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

Simplify name-table platform mathcing logic 

There's no "all other platforms", there was just ISO left.
Hardcode it in.
This commit is contained in:
Behdad Esfahbod 2017-09-27 18:09:31 -04:00
parent 55d04e25d6
commit 261464e0e2
1 changed files with 5 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/fcfreetype.c
View File

@ -1136,6 +1136,7 @@ static const FT_UShort platform_order[] = {
TT_PLATFORM_MICROSOFT, TT_PLATFORM_MICROSOFT,
TT_PLATFORM_APPLE_UNICODE, TT_PLATFORM_APPLE_UNICODE,
TT_PLATFORM_MACINTOSH, TT_PLATFORM_MACINTOSH,
TT_PLATFORM_ISO,
}; };
#define NUM_PLATFORM_ORDER (sizeof (platform_order) / sizeof (platform_order[0])) #define NUM_PLATFORM_ORDER (sizeof (platform_order) / sizeof (platform_order[0]))
@ -1369,12 +1370,9 @@ FcFreeTypeQueryFaceInternal (const FT_Face face,
* of them * of them
*/ */
snamec = FT_Get_Sfnt_Name_Count (face); snamec = FT_Get_Sfnt_Name_Count (face);
for (p = 0; p <= NUM_PLATFORM_ORDER; p++) for (p = 0; p < NUM_PLATFORM_ORDER; p++)
{ {
if (p < NUM_PLATFORM_ORDER) platform = platform_order[p];
platform = platform_order[p];
else
platform = 0xffff;
/* /*
* Order nameids so preferred names appear first * Order nameids so preferred names appear first
@ -1410,25 +1408,8 @@ FcFreeTypeQueryFaceInternal (const FT_Face face,
if (sname.name_id != nameid) if (sname.name_id != nameid)
continue; continue;
/* if (sname.platform_id != platform)
* Sort platforms in preference order, accepting continue;
* all other platforms last
*/
if (p < NUM_PLATFORM_ORDER)
{
if (sname.platform_id != platform)
continue;
}
else
{
unsigned int sp;
for (sp = 0; sp < NUM_PLATFORM_ORDER; sp++)
if (sname.platform_id == platform_order[sp])
break;
if (sp != NUM_PLATFORM_ORDER)
continue;
}
switch (sname.name_id) { switch (sname.name_id) {
#ifdef TT_NAME_ID_WWS_FAMILY #ifdef TT_NAME_ID_WWS_FAMILY