walkero
/
fontconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix incorrect merge. 

reviewed by: plam
This commit is contained in:
Patrick Lam 2005-11-26 05:05:14 +00:00
parent cbe1df8150
commit 200a44fed0
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2005-11-26 Dirk Mueller <dmueller@suse.com>
reviewed by: plam
* src/fcmatch.c (FcCompareValueList):
Fix incorrect merge.
2005-11-25 Patrick Lam <plam@mit.edu> 2005-11-25 Patrick Lam <plam@mit.edu>
* src/fcmatch.c (FcMatchObjectPtrsInit, FcCompareValueList): * src/fcmatch.c (FcMatchObjectPtrsInit, FcCompareValueList):

6
src/fcmatch.c
View File

@ -351,10 +351,10 @@ FcCompareValueList (FcObjectPtr o,
bestWeak = 1e99; bestWeak = 1e99;
j = 0; j = 0;
for (v1 = v1orig, v1_ptrU = FcValueListPtrU(v1); v1_ptrU; for (v1 = v1orig, v1_ptrU = FcValueListPtrU(v1); v1_ptrU;
v1 = FcValueListPtrU(v1)->next, v1_ptrU = FcValueListPtrU(v1)) v1 = v1_ptrU->next, v1_ptrU = FcValueListPtrU(v1))
{ {
for (v2 = v2orig, v2_ptrU = FcValueListPtrU(v2); FcValueListPtrU(v2); for (v2 = v2orig, v2_ptrU = FcValueListPtrU(v2); v2_ptrU;
v2 = FcValueListPtrU(v2)->next) v2 = v2_ptrU->next, v2_ptrU = FcValueListPtrU(v2))
{ {
v = (*_FcMatchers[i].compare) (&v1_ptrU->value, v = (*_FcMatchers[i].compare) (&v1_ptrU->value,
&v2_ptrU->value); &v2_ptrU->value);