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

Always set *changed in FcCharsetMerge

This commit is contained in:
Behdad Esfahbod 2009-06-05 17:15:53 -04:00
parent 86bdf4598f
commit cce69b07ef
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/fccharset.c
View File

@ -470,8 +470,11 @@ FcCharSetMerge (FcCharSet *a, const FcCharSet *b, FcBool *changed)
int ai = 0, bi = 0; int ai = 0, bi = 0;
FcChar16 an, bn; FcChar16 an, bn;
if (a->ref == FC_REF_CONSTANT) if (a->ref == FC_REF_CONSTANT) {
if (changed)
*changed = FcFalse;
return FcFalse; return FcFalse;
}
if (changed) { if (changed) {
*changed = !FcCharSetIsSubset(b, a); *changed = !FcCharSetIsSubset(b, a);