[varfonts] Query variable font in FcFreeTypeQueryAll()

Returns varfont pattern at the end.

[varfonts] Query variable font in FcFreeTypeQueryAll()
Returns varfont pattern at the end.
0f9bbbcf · Behdad Esfahbod · 585f0871 · 0f9bbbcf
Commit 0f9bbbcf authored Sep 13, 2017 by Behdad Esfahbod
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

src/fcfreetype.c src/fcfreetype.c +4 -2

No files found.
--- a/src/fcfreetype.c
+++ b/src/fcfreetype.c
@@ -2092,11 +2092,13 @@ FcFreeTypeQueryAll(const FcChar8	*file,
 	    if (!set || ! FcFontSetAdd (set, pat))
 	      FcPatternDestroy (pat);
 	}
-	else
+	else if (instance_num != 0x8000)
 	    err = 1;

-	if (instance_num < num_instances && !set_instance_num)
+	if (!set_instance_num && instance_num < num_instances)
 	    instance_num++;
+	else if (!set_instance_num && instance_num == num_instances)
+	    instance_num = 0x8000; /* variable font */
 	else
 	{
 	    face_num++;