[Fontconfig] fontconfig: Branch 'master'

[Akira TAGOH]

 src/fcmatch.c |    1 +
 src/fcobjs.h  |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 45221ab12fa7001b9659293d4833f828801d2518
Author: Akira TAGOH <akira at tagoh.org>
Date:   Wed Aug 7 12:19:33 2013 +0900

    Bug 67845 - Match on FC_SCALABLE

diff --git a/src/fcmatch.c b/src/fcmatch.c
index 10976d6..8b285f6 100644
--- a/src/fcmatch.c
+++ b/src/fcmatch.c
@@ -245,6 +245,7 @@ typedef enum _FcMatcherPriorityDummy {
 typedef enum _FcMatcherPriority {
     PRI1(HASH),
     PRI1(FILE),
+    PRI1(SCALABLE),
     PRI1(FOUNDRY),
     PRI1(CHARSET),
     PRI_FAMILY_STRONG,
diff --git a/src/fcobjs.h b/src/fcobjs.h
index 682fe6a..c09a40e 100644
--- a/src/fcobjs.h
+++ b/src/fcobjs.h
@@ -23,7 +23,7 @@ FC_OBJECT (FILE,		FcTypeString,	FcCompareFilename)
 FC_OBJECT (INDEX,		FcTypeInteger,	NULL)
 FC_OBJECT (RASTERIZER,		FcTypeString,	FcCompareString)
 FC_OBJECT (OUTLINE,		FcTypeBool,	FcCompareBool)
-FC_OBJECT (SCALABLE,		FcTypeBool,	NULL)
+FC_OBJECT (SCALABLE,		FcTypeBool,	FcCompareBool)
 FC_OBJECT (DPI,			FcTypeDouble,	NULL)
 FC_OBJECT (RGBA,		FcTypeInteger,	NULL)
 FC_OBJECT (SCALE,		FcTypeDouble,	NULL)