diff options
| author | marha <marha@users.sourceforge.net> | 2013-06-28 16:47:15 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-06-28 16:47:15 +0200 |
| commit | ced1a6b8f5a750fcd3b8d3d0d9bbdee830064e6c (patch) | |
| tree | 24d79f7eaee4d69dde46cf88aa7314a4fceebbe5 /fontconfig/src/fccfg.c | |
| parent | 2fe2056807d1304de86deb2b59992d51d9252ad0 (diff) | |
| download | vcxsrv-ced1a6b8f5a750fcd3b8d3d0d9bbdee830064e6c.tar.gz vcxsrv-ced1a6b8f5a750fcd3b8d3d0d9bbdee830064e6c.tar.bz2 vcxsrv-ced1a6b8f5a750fcd3b8d3d0d9bbdee830064e6c.zip | |
fontconfig mesa git update 28 June 2013
fontconfig commit 197d06c49b01413303f2c92130594daa4fcaa6ad
mesa commit 24b05ff1581b612ab6dbf4937fa4b644b4e61379
Diffstat (limited to 'fontconfig/src/fccfg.c')
| -rw-r--r-- | fontconfig/src/fccfg.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fontconfig/src/fccfg.c b/fontconfig/src/fccfg.c index fcdf73efe..9c0be24a3 100644 --- a/fontconfig/src/fccfg.c +++ b/fontconfig/src/fccfg.c @@ -721,7 +721,7 @@ FcConfigPromote (FcValue v, FcValue u, FcValuePromotionBuffer *buf) FcBool FcConfigCompareValue (const FcValue *left_o, - FcOp op_, + unsigned int op_, const FcValue *right_o) { FcValue left = FcValueCanonicalize(left_o); @@ -736,6 +736,8 @@ FcConfigCompareValue (const FcValue *left_o, if (left.type == right.type) { switch (left.type) { + case FcTypeUnknown: + break; /* No way to guess how to compare for this object */ case FcTypeInteger: break; /* FcConfigPromote prevents this from happening */ case FcTypeDouble: |