diff options
| author | marha <marha@users.sourceforge.net> | 2013-03-11 09:17:45 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-03-11 09:17:45 +0100 |
| commit | 514e0809a42027e2178bf0eccd526a08da60f399 (patch) | |
| tree | 6ee95fe742214f0fe4b20ca8b444d0cfeea67faf /fontconfig/src | |
| parent | 84798668341b15890d625e3bffbbc2d19f434568 (diff) | |
| download | vcxsrv-514e0809a42027e2178bf0eccd526a08da60f399.tar.gz vcxsrv-514e0809a42027e2178bf0eccd526a08da60f399.tar.bz2 vcxsrv-514e0809a42027e2178bf0eccd526a08da60f399.zip | |
fontconfig libX11 mesa pixman xserver xkeyboard-config git update 11 Mar
2013
xserver commit 5047810a4c20fab444b8c6eb146c55dcdb0d4219
xkeyboard-config commit 2ed85c1e936f7cd4a9540ace5c12b9fec60ee1fb
libX11 commit 3996543c1b2919e97d61a5d70fe1ebd7cd76fc83
pixman commit aaae3d8eefa069098e9014822817ca1429fdea46
fontconfig commit bdf1581e3de5528f397f19bfd4ca9caaf9e7fe4a
mesa commit b21a9d46e4be0c666327569f07b9cddeb4d42d38
Diffstat (limited to 'fontconfig/src')
| -rw-r--r-- | fontconfig/src/fccfg.c | 2 | ||||
| -rw-r--r-- | fontconfig/src/fcmatch.c | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/fontconfig/src/fccfg.c b/fontconfig/src/fccfg.c index b762376ae..7da50b50f 100644 --- a/fontconfig/src/fccfg.c +++ b/fontconfig/src/fccfg.c @@ -429,7 +429,7 @@ retry: if (config == cfg) return FcTrue; - if (!config->fonts[FcSetSystem]) + if (config && !config->fonts[FcSetSystem]) if (!FcConfigBuildFonts (config)) return FcFalse; diff --git a/fontconfig/src/fcmatch.c b/fontconfig/src/fcmatch.c index 23f985a6c..7993b81de 100644 --- a/fontconfig/src/fcmatch.c +++ b/fontconfig/src/fcmatch.c @@ -532,7 +532,10 @@ FcFontRenderPrepare (FcConfig *config, { pe = &FcPatternElts(pat)[i]; fe = FcPatternObjectFindElt (font, pe->object); - if (!fe) + if (!fe && + pe->object != FC_FAMILYLANG_OBJECT && + pe->object != FC_STYLELANG_OBJECT && + pe->object != FC_FULLNAMELANG_OBJECT) { FcPatternObjectListAdd (new, pe->object, FcValueListDuplicate (FcPatternEltValues(pe)), |