Commit 67dcfeb4 authored by Akira TAGOH's avatar Akira TAGOH

Fix FcFontList doesn't return a font with FC_COLOR=true

"color" property has a value more than 1 since 48e9e5f4 because the value of FT_HAS_COLOR
is directly set to it. this seems breaking the behavior of FcFontList with FC_COLOR=true
because it is more than FcDontCare.

So changing comparison that way.
parent 2bd559f7
Pipeline #10130 passed with stage
in 27 minutes and 55 seconds
......@@ -821,25 +821,25 @@ FcConfigCompareValue (const FcValue *left_o,
break;
case FcOpContains:
case FcOpListing:
ret = left.u.b == right.u.b || left.u.b == FcDontCare;
ret = left.u.b == right.u.b || left.u.b >= FcDontCare;
break;
case FcOpNotEqual:
ret = left.u.b != right.u.b;
break;
case FcOpNotContains:
ret = !(left.u.b == right.u.b || left.u.b == FcDontCare);
ret = !(left.u.b == right.u.b || left.u.b >= FcDontCare);
break;
case FcOpLess:
ret = left.u.b != right.u.b && right.u.b == FcDontCare;
ret = left.u.b != right.u.b && right.u.b >= FcDontCare;
break;
case FcOpLessEqual:
ret = left.u.b == right.u.b || right.u.b == FcDontCare;
ret = left.u.b == right.u.b || right.u.b >= FcDontCare;
break;
case FcOpMore:
ret = left.u.b != right.u.b && left.u.b == FcDontCare;
ret = left.u.b != right.u.b && left.u.b >= FcDontCare;
break;
case FcOpMoreEqual:
ret = left.u.b == right.u.b || left.u.b == FcDontCare;
ret = left.u.b == right.u.b || left.u.b >= FcDontCare;
break;
default:
break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment