summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Lam <plam@MIT.EDU>2006-04-20 16:57:50 +0000
committerPatrick Lam <plam@MIT.EDU>2006-04-20 16:57:50 +0000
commit55e145b0250e5c233d9fed1f8f5efe690374cdf2 (patch)
tree756f2df72c697f96c2ce26abf3d83b2288c99b3c
parent93f67dfc73601ea2f73c1fa2d9f4f13a84cf1232 (diff)
Prevent terrible perf regression by getting the if-condition right
(reported by Wouter Bolsterlee).
-rw-r--r--ChangeLog8
-rw-r--r--src/fcmatch.c2
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 0f83c24..919f0bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-2006-04-19 Patrick Lam <plam@mit.edu>
+2006-04-20 Patrick Lam <plam@mit.edu>
* ChangeLog:
* README:
* configure.in:
@@ -6,6 +6,12 @@
Bump version to 2.3.95.
+2006-04-20 Patrick Lam <plam@mit.edu>
+ * src/fcmatch.c (FcSortWalk):
+
+ Prevent terrible perf regression by getting the if-condition
+ right (reported by Wouter Bolsterlee).
+
2006-04-19 Patrick Lam <plam@mit.edu>
Dominic Lachowicz <cinamod@hotmail.com>
diff --git a/src/fcmatch.c b/src/fcmatch.c
index ae37fd7..8d0fbc3 100644
--- a/src/fcmatch.c
+++ b/src/fcmatch.c
@@ -808,7 +808,7 @@ FcSortWalk (FcSortNode **n, int nnode, FcFontSet *fs, FcCharSet **cs, FcBool tri
*/
if (!trim || !*cs || !FcCharSetIsSubset (ncs, *cs))
{
- if (!trim && build_cs)
+ if (trim || build_cs)
{
if (*cs)
{