diff options
| author | dawes <dawes> | 2006-03-19 01:58:37 +0000 |
|---|---|---|
| committer | dawes <dawes> | 2006-03-19 01:58:37 +0000 |
| commit | b3fc1911d74021e0d268dc26bb853130a1099a4a (patch) | |
| tree | 5156a45b364328a98ffa1d14999926c58b1f8d02 /extras | |
| parent | fcef9e69075716033669444c0e73e73e72cf3861 (diff) | |
250. Fix a bug in fontconfig's pattern matching that can cause FcFontMatch()
to fail when it shouldn't (David Dawes).
Diffstat (limited to 'extras')
| -rw-r--r-- | extras/fontconfig/src/fcmatch.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/extras/fontconfig/src/fcmatch.c b/extras/fontconfig/src/fcmatch.c index daf515a82..0d2d2e5af 100644 --- a/extras/fontconfig/src/fcmatch.c +++ b/extras/fontconfig/src/fcmatch.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/lib/fontconfig/src/fcmatch.c,v 1.21 2002/09/26 00:17:28 keithp Exp $ + * $XFree86: xc/extras/fontconfig/src/fcmatch.c,v 1.1.1.1 2003/06/04 02:58:01 dawes Exp $ * * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. * @@ -27,6 +27,7 @@ #include "fcint.h" #include <stdio.h> +#if 0 static double FcCompareInteger (char *object, FcValue value1, FcValue value2) { @@ -39,6 +40,7 @@ FcCompareInteger (char *object, FcValue value1, FcValue value2) v = -v; return (double) v; } +#endif static double FcCompareString (char *object, FcValue value1, FcValue value2) @@ -173,7 +175,7 @@ static FcMatcher _FcMatchers [] = { { FC_LANG, FcCompareLang, 3, 3 }, #define MATCH_LANG 3 - { FC_SPACING, FcCompareInteger, 5, 5 }, + { FC_SPACING, FcCompareSize, 5, 5 }, #define MATCH_SPACING 4 { FC_PIXEL_SIZE, FcCompareSize, 6, 6 }, @@ -182,10 +184,10 @@ static FcMatcher _FcMatchers [] = { { FC_STYLE, FcCompareString, 7, 7 }, #define MATCH_STYLE 6 - { FC_SLANT, FcCompareInteger, 8, 8 }, + { FC_SLANT, FcCompareSize, 8, 8 }, #define MATCH_SLANT 7 - { FC_WEIGHT, FcCompareInteger, 9, 9 }, + { FC_WEIGHT, FcCompareSize, 9, 9 }, #define MATCH_WEIGHT 8 { FC_ANTIALIAS, FcCompareBool, 10, 10 }, @@ -197,7 +199,7 @@ static FcMatcher _FcMatchers [] = { { FC_OUTLINE, FcCompareBool, 12, 12 }, #define MATCH_OUTLINE 11 - { FC_FONTVERSION, FcCompareInteger, 13, 13 }, + { FC_FONTVERSION, FcCompareSize, 13, 13 }, #define MATCH_FONTVERSION 12 }; |