Force FC_FOUNDRY and FC_WIDTH to always be set so that matches looking for

[fontconfig.git] / src / fcfreetype.c

diff --git a/src/fcfreetype.c b/src/fcfreetype.c
index 2574b15fdf0791f4dd0cf40e43ff43abbe0ca7e8..6248595a2a0aa6f287503401acd4433803d3a169 100644 (file)
--- a/src/fcfreetype.c
+++ b/src/fcfreetype.c
@@ -942,21 +942,23 @@ FcFreeTypeQuery (const FcChar8    *file,
            weight = FC_WEIGHT_BOLD;
     }
 
+    if (width == -1)
+       width = FC_WIDTH_NORMAL;
+
+    if (foundry == 0)
+       foundry = "unknown";
+
     if (!FcPatternAddInteger (pat, FC_SLANT, slant))
        goto bail1;
 
     if (!FcPatternAddInteger (pat, FC_WEIGHT, weight))
        goto bail1;
 
-    if (width != -1)
-       if (!FcPatternAddInteger (pat, FC_WIDTH, width))
-           goto bail1;
+    if (!FcPatternAddInteger (pat, FC_WIDTH, width))
+       goto bail1;
 
-    if(foundry) 
-    {
-        if(!FcPatternAddString (pat, FC_FOUNDRY, foundry))
-            goto bail1;
-    }
+    if (!FcPatternAddString (pat, FC_FOUNDRY, foundry))
+       goto bail1;
 
     /*
      * Compute the unicode coverage for the font