aboutsummaryrefslogtreecommitdiff
path: root/fontconfig
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-01-15 08:12:01 +0100
committermarha <marha@users.sourceforge.net>2013-01-15 08:12:01 +0100
commit15cdb95b194cb051a5d469cc9eb73eb0eed4db41 (patch)
treee95bdde41b08c417f162e21471def49b08fed4fd /fontconfig
parent7fbec6dbb6e061fe5b8c592dd602cf4b4c65155a (diff)
parent2fe4d492f39a5a5b67c4444805f7b1eaa1e745a9 (diff)
downloadvcxsrv-15cdb95b194cb051a5d469cc9eb73eb0eed4db41.tar.gz
vcxsrv-15cdb95b194cb051a5d469cc9eb73eb0eed4db41.tar.bz2
vcxsrv-15cdb95b194cb051a5d469cc9eb73eb0eed4db41.zip
Merge remote-tracking branch 'origin/released'
* origin/released: mesa fontconfig xkeyboard-config git update 15 jan 2013
Diffstat (limited to 'fontconfig')
-rw-r--r--fontconfig/src/fcmatch.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/fontconfig/src/fcmatch.c b/fontconfig/src/fcmatch.c
index 6778967b9..fc891cb50 100644
--- a/fontconfig/src/fcmatch.c
+++ b/fontconfig/src/fcmatch.c
@@ -549,8 +549,9 @@ FcFontRenderPrepare (FcConfig *config,
fe = FcPatternObjectFindElt (font, pe->object);
if (!fe)
{
- v = FcValueCanonicalize(&FcPatternEltValues(pe)->value);
- FcPatternObjectAdd (new, pe->object, v, FcTrue);
+ FcPatternObjectListAdd (new, pe->object,
+ FcValueListDuplicate (FcPatternEltValues(pe)),
+ FcFalse);
}
}