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

Fix some testcase fails for 14c265a1 

Add an extra code to ignore an error of FT_Get_MM_Var()
only when FT_MM_Var variable isn't used in any case.
This commit is contained in:
Akira TAGOH 2021-11-09 20:42:52 +09:00
parent 14c265a10a
commit 5841bd012d
1 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/fcfreetype.c
View File

@ -1232,6 +1232,7 @@ FcFreeTypeQueryFaceInternal (const FT_Face face,
int st; int st;
FcBool symbol = FcFalse; FcBool symbol = FcFalse;
FT_Error ftresult;
FcInitDebug (); /* We might be called with no initizalization whatsoever. */ FcInitDebug (); /* We might be called with no initizalization whatsoever. */
@ -1257,11 +1258,13 @@ FcFreeTypeQueryFaceInternal (const FT_Face face,
goto bail1; goto bail1;
} }
if (FT_Get_MM_Var (face, &master)) ftresult = FT_Get_MM_Var (face, &master);
goto bail1;
if (id >> 16) if (id >> 16)
{ {
if (ftresult)
goto bail1;
if (id >> 16 == 0x8000) if (id >> 16 == 0x8000)
{ {
/* Query variable font itself. */ /* Query variable font itself. */
@ -1353,19 +1356,25 @@ FcFreeTypeQueryFaceInternal (const FT_Face face,
} }
else else
{ {
unsigned int i; if (!ftresult)
for (i = 0; i < master->num_axis; i++) {
{ unsigned int i;
switch (master->axis[i].tag) for (i = 0; i < master->num_axis; i++)
{ {
switch (master->axis[i].tag)
{
case FT_MAKE_TAG ('o','p','s','z'): case FT_MAKE_TAG ('o','p','s','z'):
if (!FcPatternObjectAddDouble (pat, FC_SIZE_OBJECT, master->axis[i].def / (double) (1U << 16))) if (!FcPatternObjectAddDouble (pat, FC_SIZE_OBJECT, master->axis[i].def / (double) (1U << 16)))
goto bail1; goto bail1;
variable_size = FcTrue; variable_size = FcTrue;
break; break;
} }
}
} }
else
{
/* ignore an error of FT_Get_MM_Var() */
}
} }
if (!FcPatternObjectAddBool (pat, FC_VARIABLE_OBJECT, variable)) if (!FcPatternObjectAddBool (pat, FC_VARIABLE_OBJECT, variable))
goto bail1; goto bail1;