diff options
| author | marha <marha@users.sourceforge.net> | 2013-04-08 08:17:23 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-04-08 08:17:23 +0200 |
| commit | 95fb19d661154ba8cfc6c793a0daa25657294b3b (patch) | |
| tree | 4abbb540731ff40c75c4a4282670dba886e60cd7 /fontconfig/src | |
| parent | 176eab9e8277db1549bfc6c9ae805c4e1858f0b0 (diff) | |
| download | vcxsrv-95fb19d661154ba8cfc6c793a0daa25657294b3b.tar.gz vcxsrv-95fb19d661154ba8cfc6c793a0daa25657294b3b.tar.bz2 vcxsrv-95fb19d661154ba8cfc6c793a0daa25657294b3b.zip | |
fontconfig libXau mesa xserver xkeyboard-config git update 8 Apr 2013
xserver commit 8928f8fa0bb154ce437af703ff702016f0dcf127
xkeyboard-config commit e5c6729f3679fe87a703eb1d7ec1cf0a61814ca8
libXau commit f5a57d8a21a34d7084cce294e24c0422e02ef8ef
fontconfig commit 18bf57c70aafcad031c0b43756b754dcaf6a756a
mesa commit eff66bc9f855fff5c4f5f57f247254a97431e8ad
Diffstat (limited to 'fontconfig/src')
| -rw-r--r-- | fontconfig/src/Makefile.am | 2 | ||||
| -rw-r--r-- | fontconfig/src/fcmatch.c | 23 |
2 files changed, 8 insertions, 17 deletions
diff --git a/fontconfig/src/Makefile.am b/fontconfig/src/Makefile.am index 9fd7dd81a..066cc03e7 100644 --- a/fontconfig/src/Makefile.am +++ b/fontconfig/src/Makefile.am @@ -70,7 +70,7 @@ uninstall-ms-import-lib: endif -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/src \ $(FREETYPE_CFLAGS) \ diff --git a/fontconfig/src/fcmatch.c b/fontconfig/src/fcmatch.c index 68f39aef5..2d7b79840 100644 --- a/fontconfig/src/fcmatch.c +++ b/fontconfig/src/fcmatch.c @@ -227,9 +227,10 @@ typedef enum _FcMatcherPriorityDummy { #undef FC_OBJECT #undef PRI1 -#define PRI1(n) \ - PRI_ ## n ## _STRONG, \ - PRI_ ## n ## _WEAK +#define PRI1(n) \ + PRI_ ## n, \ + PRI_ ## n ## _STRONG = PRI_ ## n, \ + PRI_ ## n ## _WEAK = PRI_ ## n typedef enum _FcMatcherPriority { PRI1(HASH), @@ -237,9 +238,8 @@ typedef enum _FcMatcherPriority { PRI1(FOUNDRY), PRI1(CHARSET), PRI_FAMILY_STRONG, - PRI_LANG_STRONG, PRI_POSTSCRIPT_NAME_STRONG, - PRI_LANG_WEAK, + PRI1(LANG), PRI_FAMILY_WEAK, PRI_POSTSCRIPT_NAME_WEAK, PRI1(SPACING), @@ -910,8 +910,7 @@ FcFontSetSort (FcConfig *config FC_UNUSED, * If this node matches any language, go check * which ones and satisfy those entries */ - if (nodeps[f]->score[PRI_LANG_STRONG] < 2000 || - nodeps[f]->score[PRI_LANG_WEAK] < 2000) + if (nodeps[f]->score[PRI_LANG] < 2000) { for (i = 0; i < nPatternLang; i++) { @@ -935,13 +934,6 @@ FcFontSetSort (FcConfig *config FC_UNUSED, } patternLangSat[i] = FcTrue; satisfies = FcTrue; - /* adjust score to ensure it's not more than 10000.0 - * which would means the lang didn't satisfy the requirements - */ - if (nodeps[f]->score[PRI_LANG_STRONG] > 10000.0) - nodeps[f]->score[PRI_LANG_STRONG] = 10000.0; - if (nodeps[f]->score[PRI_LANG_WEAK] > 10000.0) - nodeps[f]->score[PRI_LANG_WEAK] = 10000.0; break; } } @@ -949,8 +941,7 @@ FcFontSetSort (FcConfig *config FC_UNUSED, } if (!satisfies) { - nodeps[f]->score[PRI_LANG_STRONG] = 10000.0; - nodeps[f]->score[PRI_LANG_WEAK] = 10000.0; + nodeps[f]->score[PRI_LANG] = 10000.0; } } |