From ced1a6b8f5a750fcd3b8d3d0d9bbdee830064e6c Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 28 Jun 2013 16:47:15 +0200 Subject: fontconfig mesa git update 28 June 2013 fontconfig commit 197d06c49b01413303f2c92130594daa4fcaa6ad mesa commit 24b05ff1581b612ab6dbf4937fa4b644b4e61379 --- fontconfig/src/fcname.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'fontconfig/src/fcname.c') diff --git a/fontconfig/src/fcname.c b/fontconfig/src/fcname.c index a52534548..712b2fad3 100644 --- a/fontconfig/src/fcname.c +++ b/fontconfig/src/fcname.c @@ -76,6 +76,8 @@ FcObjectValidType (FcObject object, FcType type) if (t) { switch ((int) t->type) { + case FcTypeUnknown: + return FcTrue; case FcTypeDouble: case FcTypeInteger: if (type == FcTypeDouble || type == FcTypeInteger) @@ -86,7 +88,7 @@ FcObjectValidType (FcObject object, FcType type) return FcTrue; break; default: - if (t->type == (unsigned int) -1 || type == t->type) + if (type == t->type) return FcTrue; break; } @@ -474,6 +476,7 @@ FcNameUnparseValue (FcStrBuf *buf, FcValue v = FcValueCanonicalize(v0); switch (v.type) { + case FcTypeUnknown: case FcTypeVoid: return FcTrue; case FcTypeInteger: -- cgit v1.2.3