Move user and local conf file loading into conf.avail files

[fontconfig.git] / src / fcpat.c

diff --git a/src/fcpat.c b/src/fcpat.c
index 74327456cc27918c0e9af8d49794866fb0dfb851..9cd01a02a9303c10ed0d9c578ed850b5d7df8dda 100644 (file)
--- a/src/fcpat.c
+++ b/src/fcpat.c
@@ -491,7 +491,15 @@ FcPatternObjectAddWithBinding  (FcPattern  *p,
      * Make sure the stored type is valid for built-in objects
      */
     if (!FcObjectValidType (object, value.type))
+    {
+       if (FcDebug() & FC_DBG_OBJTYPES)
+       {
+           printf ("FcPattern object %s does not accept value ",
+                   FcObjectName (object));
+           FcValuePrint (value);
+       }
        goto bail1;
+    }
 
     new->value = value;
     new->binding = binding;
@@ -1044,7 +1052,7 @@ void
 FcPatternFini (void)
 {
     FcStrStaticNameFini ();
-    FcObjectStaticNameFini ();
+    FcObjectFini ();
 }
 
 FcBool
@@ -1096,6 +1104,13 @@ FcPatternSerialize (FcSerialize *serialize, const FcPattern *pat)
                                                          values_serialized,
                                                          FcValueList);
     }
+    if (FcDebug() & FC_DBG_CACHEV) {
+       printf ("Raw pattern:\n");
+       FcPatternPrint (pat);
+       printf ("Serialized pattern:\n");
+       FcPatternPrint (pat_serialized);
+       printf ("\n");
+    }
     return pat_serialized;
 }
 
@@ -1180,6 +1195,7 @@ FcValueListSerialize (FcSerialize *serialize, const FcValueList *vl)
        default:
            break;
        }
+       prev_serialized = vl_serialized;
        vl = vl->next;
     }
     return head_serialized;