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

If a varfont has 'opsz' axis, set FC_SIZE on default instant pattern 

Otherwise default-instance pattern would match as an "all sizes",
which would be wrong. See:

https://gitlab.gnome.org/GNOME/pango/-/issues/621#note_1305844
This commit is contained in:
Behdad Esfahbod 2021-11-08 21:16:08 -08:00 committed by Akira TAGOH
parent ad70d78597
commit 14c265a10a
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/fcfreetype.c
View File

@ -1257,16 +1257,15 @@ FcFreeTypeQueryFaceInternal (const FT_Face face,
goto bail1; goto bail1;
} }
if (id >> 16)
{
if (FT_Get_MM_Var (face, &master)) if (FT_Get_MM_Var (face, &master))
goto bail1; goto bail1;
if (id >> 16)
{
if (id >> 16 == 0x8000) if (id >> 16 == 0x8000)
{ {
/* Query variable font itself. */ /* Query variable font itself. */
unsigned int i; unsigned int i;
for (i = 0; i < master->num_axis; i++) for (i = 0; i < master->num_axis; i++)
{ {
double min_value = master->axis[i].minimum / (double) (1U << 16); double min_value = master->axis[i].minimum / (double) (1U << 16);
@ -1352,6 +1351,22 @@ FcFreeTypeQueryFaceInternal (const FT_Face face,
else else
goto bail1; goto bail1;
} }
else
{
unsigned int i;
for (i = 0; i < master->num_axis; i++)
{
switch (master->axis[i].tag)
{
case FT_MAKE_TAG ('o','p','s','z'):
if (!FcPatternObjectAddDouble (pat, FC_SIZE_OBJECT, master->axis[i].def / (double) (1U << 16)))
goto bail1;
variable_size = FcTrue;
break;
}
}
}
if (!FcPatternObjectAddBool (pat, FC_VARIABLE_OBJECT, variable)) if (!FcPatternObjectAddBool (pat, FC_VARIABLE_OBJECT, variable))
goto bail1; goto bail1;