From bbbaac369186f6d2c21d28a091e4a8b6259f8e8a Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Fri, 22 Feb 2002 18:54:07 +0000 Subject: [PATCH] fontconfig: some config file parsing mistakes --- src/fcfreetype.c | 2 +- src/fcint.h | 9 --------- src/fcxml.c | 8 ++++++-- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/src/fcfreetype.c b/src/fcfreetype.c index c41492f..ccd9651 100644 --- a/src/fcfreetype.c +++ b/src/fcfreetype.c @@ -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; diff --git a/src/fcint.h b/src/fcint.h index 1d0c070..0bd06f5 100644 --- a/src/fcint.h +++ b/src/fcint.h @@ -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); diff --git a/src/fcxml.c b/src/fcxml.c index 64a5269..bbe41fc 100644 --- a/src/fcxml.c +++ b/src/fcxml.c @@ -1,5 +1,5 @@ /* - * $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: -- 2.39.5