Commit bbbaac36 authored by Keith Packard's avatar Keith Packard

fontconfig: some config file parsing mistakes

parent a398554a
......@@ -154,7 +154,7 @@ FcFreeTypeQuery (const FcChar8 *file,
if (!FcPatternAddString (pat, FC_SOURCE, (FcChar8 *) "FreeType"))
goto bail1;
#if 0
#if 1
if ((face->face_flags & FT_FACE_FLAG_FIXED_WIDTH) != 0)
if (!FcPatternAddInteger (pat, FC_SPACING, FC_MONO))
goto bail1;
......
......@@ -327,9 +327,6 @@ FcValuePrint (FcValue v);
void
FcValueListPrint (FcValueList *l);
void
FcPatternPrint (FcPattern *p);
void
FcOpPrint (FcOp op);
......@@ -433,12 +430,6 @@ FcMemFree (int kind, int size);
FcBool
FcNameBool (FcChar8 *v, FcBool *result);
FcBool
FcStrBufChar (FcStrBuf *buf, FcChar8 c);
FcBool
FcStrBufString (FcStrBuf *buf, const FcChar8 *s);
/* fcpat.c */
void
FcValueListDestroy (FcValueList *l);
......
/*
* $XFree86: xc/lib/fontconfig/src/fcxml.c,v 1.3 2002/02/18 22:29:28 keithp Exp $
* $XFree86: xc/lib/fontconfig/src/fcxml.c,v 1.4 2002/02/20 00:32:30 keithp Exp $
*
* Copyright 2002 Keith Packard, member of The XFree86 Project, Inc.
*
......@@ -1097,9 +1097,13 @@ FcPopExpr (FcConfigParse *parse)
break;
case FcVStackString:
case FcVStackFamily:
expr = FcExprCreateString (vstack->u.string);
break;
case FcVStackField:
expr = FcExprCreateField ((char *) vstack->u.string);
break;
case FcVStackConstant:
expr = FcExprCreateString (vstack->u.string);
expr = FcExprCreateConst (vstack->u.string);
break;
case FcVStackPrefer:
case FcVStackAccept:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment