diff options
| author | marha <marha@users.sourceforge.net> | 2013-09-20 11:58:12 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-09-20 11:58:12 +0200 |
| commit | a5179a42a3376f0d8c1d01456235b044854d8bdc (patch) | |
| tree | 04018368b95d6eb802adbf083fdd774a0336be51 /fontconfig/src | |
| parent | 4888b09cfc72713f460dd7457fb2b7eca0abb91c (diff) | |
| parent | 55c05b8a12944349b00053253d3a49b223a9f4de (diff) | |
| download | vcxsrv-a5179a42a3376f0d8c1d01456235b044854d8bdc.tar.gz vcxsrv-a5179a42a3376f0d8c1d01456235b044854d8bdc.tar.bz2 vcxsrv-a5179a42a3376f0d8c1d01456235b044854d8bdc.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa pixman git update 20 Sep 2013
Diffstat (limited to 'fontconfig/src')
| -rw-r--r-- | fontconfig/src/fcmatch.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fontconfig/src/fcmatch.c b/fontconfig/src/fcmatch.c index dec92b9cf..627aa1a16 100644 --- a/fontconfig/src/fcmatch.c +++ b/fontconfig/src/fcmatch.c @@ -552,14 +552,16 @@ FcFontRenderPrepare (FcConfig *config, continue; } + FcPatternObjectAdd (new, fe->object, v, FcFalse); } else { if (fel) goto copy_lang; - v = FcValueCanonicalize(&FcPatternEltValues (fe)->value); + FcPatternObjectListAdd (new, fe->object, + FcValueListDuplicate (FcPatternEltValues (fe)), + FcTrue); } - FcPatternObjectAdd (new, fe->object, v, FcFalse); } for (i = 0; i < pat->num; i++) { |