From: Keith Packard <keithp@keithp.com>
Date: Thu, 24 Apr 2003 15:29:33 +0000 (+0000)
Subject: FcFontList broken when presented a charset - was comparing inclusion in the
X-Git-Tag: fc-2_2_90~29
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=f45d39b1fda93c949f4625a9fcee0c482b5cacd7;p=fontconfig.git

FcFontList broken when presented a charset - was comparing inclusion in the
    wrong direction
---

diff --git a/src/fccfg.c b/src/fccfg.c
index 36a76a4..238edd3 100644
--- a/src/fccfg.c
+++ b/src/fccfg.c
@@ -578,12 +578,12 @@ FcConfigCompareValue (const FcValue	m_o,
 	case FcTypeCharSet:
 	    switch (op) {
 	    case FcOpContains:
-		/* m contains v if v is a subset of m */
-		ret = FcCharSetIsSubset (v.u.c, m.u.c);
+		/* v contains m if m is a subset of v */
+		ret = FcCharSetIsSubset (m.u.c, v.u.c);
 		break;
 	    case FcOpNotContains:
-		/* m contains v if v is a subset of m */
-		ret = !FcCharSetIsSubset (v.u.c, m.u.c);
+		/* v contains m if m is a subset of v */
+		ret = !FcCharSetIsSubset (m.u.c, v.u.c);
 		break;
 	    case FcOpEqual:
 		ret = FcCharSetEqual (m.u.c, v.u.c);
diff --git a/src/fccharset.c b/src/fccharset.c
index 1c0ebdd..d87a720 100644
--- a/src/fccharset.c
+++ b/src/fccharset.c
@@ -596,6 +596,9 @@ FcCharSetIsSubset (const FcCharSet *a, const FcCharSet *b)
     {
 	an = a->numbers[ai];
 	bn = b->numbers[bi];
+	/*
+	 * Check matching pages
+	 */
 	if (an == bn)
 	{
 	    FcChar32	*am = a->leaves[ai]->map;
@@ -604,6 +607,9 @@ FcCharSetIsSubset (const FcCharSet *a, const FcCharSet *b)
 	    if (am != bm)
 	    {
 		int	i = 256/32;
+		/*
+		 * Does am have any bits not in bm?
+		 */
 		while (i--)
 		    if (*am++ & ~*bm++)
 			return FcFalse;
@@ -611,6 +617,9 @@ FcCharSetIsSubset (const FcCharSet *a, const FcCharSet *b)
 	    ai++;
 	    bi++;
 	}
+	/*
+	 * Does a have any pages not in b?
+	 */
 	else if (an < bn)
 	    return FcFalse;
 	else
@@ -618,6 +627,9 @@ FcCharSetIsSubset (const FcCharSet *a, const FcCharSet *b)
 	    int	    low = bi + 1;
 	    int	    high = b->num - 1;
 
+	    /*
+	     * Search for page 'an' in 'b'
+	     */
 	    while (low <= high)
 	    {
 		int mid = (low + high) >> 1;
@@ -637,6 +649,9 @@ FcCharSetIsSubset (const FcCharSet *a, const FcCharSet *b)
 		bi++;
 	}
     }
+    /*
+     * did we look at every page?
+     */
     return ai >= a->num;
 }