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

Fix build error with BDF prop local. Free langset after query

This commit is contained in:
Keith Packard 2003-05-17 02:17:19 +00:00
parent f777f1b35d
commit 53183e66e5
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/fcfreetype.c
View File

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