[Fontconfig] fontconfig: Branch 'master'

[Keith Packard]

 src/fcmatch.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit b808204023ab47eb06dc520665eb7a0473320a9b
Author: Evgeniy Stepanov <eugeni.stepanov at gmail.com>
Date:   Sat May 24 16:09:17 2008 -0700

    Fix index/offset for 'decorative' matcher. Bug 15890.
    
    It seems indices in _FcMatchers array are slightly mixed up, MATCH_DECORATIVE
    should be 10, not 11.
    
    And MATCH_RASTERIZER_INDEX should be 13, not 12, right?

diff --git a/src/fcmatch.c b/src/fcmatch.c
index f041052..f104e05 100644
--- a/src/fcmatch.c
+++ b/src/fcmatch.c
@@ -226,17 +226,16 @@ static FcMatcher _FcMatchers [] = {
 #define MATCH_WIDTH_INDEX   10
     
     { FC_DECORATIVE_OBJECT,	FcCompareBool,		11, 11 },
-#define MATCH_DECORATIVE	11
-#define MATCH_DECORATIVE_INDEX	12
+#define MATCH_DECORATIVE	10
+#define MATCH_DECORATIVE_INDEX	11
 
     { FC_ANTIALIAS_OBJECT,	FcCompareBool,		12, 12 },
-    
 #define MATCH_ANTIALIAS		    11
 #define MATCH_ANTIALIAS_INDEX	    12
     
     { FC_RASTERIZER_OBJECT,	FcCompareString,	13, 13 },
 #define MATCH_RASTERIZER	    12
-#define MATCH_RASTERIZER_INDEX	    12
+#define MATCH_RASTERIZER_INDEX	    13
 
     { FC_OUTLINE_OBJECT,	FcCompareBool,		14, 14 },
 #define MATCH_OUTLINE		    13