]> git.wh0rd.org - fontconfig.git/commitdiff
Fix build error with BDF prop local. Free langset after query
authorKeith Packard <keithp@keithp.com>
Sat, 17 May 2003 02:17:19 +0000 (02:17 +0000)
committerKeith Packard <keithp@keithp.com>
Sat, 17 May 2003 02:17:19 +0000 (02:17 +0000)
src/fcfreetype.c

index 5f032e14ae1057a41b7739d30fbf91bde228895e..df13ad369932f89f87582cda548a8dce1419819a 100644 (file)
@@ -358,6 +358,9 @@ FcFreeTypeQuery (const FcChar8      *file,
     int                    spacing;
     TT_OS2         *os2;
     PS_FontInfoRec  psfontinfo;
+#ifdef USE_FTBDF
+    BDF_PropertyRec prop;
+#endif
     TT_Header      *head;
     const FcChar8   *exclusiveLang = 0;
     FT_SfntName            sname;
@@ -832,7 +835,6 @@ FcFreeTypeQuery (const FcChar8      *file,
 
     if (width == -1)
     {
-       BDF_PropertyRec prop;
        if (MY_Get_BDF_Property(face, "RELATIVE_SETWIDTH", &prop) == 0 &&
            (prop.type == BDF_PROPERTY_TYPE_INTEGER ||
             prop.type == BDF_PROPERTY_TYPE_CARDINAL))
@@ -964,7 +966,12 @@ FcFreeTypeQuery (const FcChar8     *file,
        goto bail2;
 
     if (!FcPatternAddLangSet (pat, FC_LANG, ls))
+    {
+       FcLangSetDestroy (ls);
        goto bail2;
+    }
+
+    FcLangSetDestroy (ls);
 
     if (spacing != FC_PROPORTIONAL)
        if (!FcPatternAddInteger (pat, FC_SPACING, spacing))