diff options
| author | marha <marha@users.sourceforge.net> | 2014-07-11 18:04:20 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-07-11 18:04:20 +0200 |
| commit | 3865d60ef607cbb00c819e905e40d3628b8eca29 (patch) | |
| tree | 73d8064951a7abbe4897bcc25959463d08544495 /fontconfig/src | |
| parent | 294a395f15dec9e7aa24b83b08f47ba54b9bd232 (diff) | |
| parent | e708bebcc029873004ade4241f347ce8c58896af (diff) | |
| download | vcxsrv-3865d60ef607cbb00c819e905e40d3628b8eca29.tar.gz vcxsrv-3865d60ef607cbb00c819e905e40d3628b8eca29.tar.bz2 vcxsrv-3865d60ef607cbb00c819e905e40d3628b8eca29.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'fontconfig/src')
| -rw-r--r-- | fontconfig/src/fcmatch.c | 15 | ||||
| -rw-r--r-- | fontconfig/src/fcobjs.h | 2 |
2 files changed, 5 insertions, 12 deletions
diff --git a/fontconfig/src/fcmatch.c b/fontconfig/src/fcmatch.c index 0c0a0670e..78255186f 100644 --- a/fontconfig/src/fcmatch.c +++ b/fontconfig/src/fcmatch.c @@ -245,16 +245,8 @@ FcCompareFilename (FcValue *v1, FcValue *v2) return 3.0; } -static double -FcCompareHash (FcValue *v1, FcValue *v2) -{ - const FcChar8 *s1 = FcValueString (v1), *s2 = FcValueString (v2); - /* Do not match an empty string */ - if (!s1 || !s2 || !s1[0] || !s2[0]) - return 1.0; - return FcCompareString (v1, v2); -} +/* Define priorities to -1 for objects that don't have a compare function. */ #define PRI_NULL(n) \ PRI_ ## n ## _STRONG = -1, \ @@ -269,7 +261,6 @@ FcCompareHash (FcValue *v1, FcValue *v2) #define PRI_FcCompareCharSet(n) PRI1(n) #define PRI_FcCompareLang(n) PRI1(n) #define PRI_FcComparePostScript(n) PRI1(n) -#define PRI_FcCompareHash(n) PRI1(n) #define PRI_FcCompareSizeRange(n) PRI1(n) #define FC_OBJECT(NAME, Type, Cmp) PRI_##Cmp(NAME) @@ -280,6 +271,9 @@ typedef enum _FcMatcherPriorityDummy { #undef FC_OBJECT + +/* Canonical match priority order. */ + #undef PRI1 #define PRI1(n) \ PRI_ ## n, \ @@ -287,7 +281,6 @@ typedef enum _FcMatcherPriorityDummy { PRI_ ## n ## _WEAK = PRI_ ## n typedef enum _FcMatcherPriority { - PRI1(HASH), PRI1(FILE), PRI1(FONTFORMAT), PRI1(SCALABLE), diff --git a/fontconfig/src/fcobjs.h b/fontconfig/src/fcobjs.h index dc3d83404..bfdf4b58b 100644 --- a/fontconfig/src/fcobjs.h +++ b/fontconfig/src/fcobjs.h @@ -66,6 +66,6 @@ FC_OBJECT (LCD_FILTER, FcTypeInteger, NULL) FC_OBJECT (NAMELANG, FcTypeString, NULL) FC_OBJECT (FONT_FEATURES, FcTypeString, NULL) FC_OBJECT (PRGNAME, FcTypeString, NULL) -FC_OBJECT (HASH, FcTypeString, FcCompareHash) /* deprecated */ +FC_OBJECT (HASH, FcTypeString, NULL) /* deprecated */ FC_OBJECT (POSTSCRIPT_NAME, FcTypeString, FcComparePostScript) /* ^-------------- Add new objects here. */ |