FcLangSetHasLang was not actually checking the language set itself

This commit is contained in:
Keith Packard 2002-08-26 23:34:31 +00:00
parent 5d6788ac7e
commit 2458a6d8d8
2 changed files with 8 additions and 3 deletions

View File

@ -1,3 +1,7 @@
Mon Aug 26 16:33:04 PDT 2002 keithp
+ Owen discovered that FcLangSetHasLang wasn't actuall
checking the language set.
Mon Aug 26 13:37:23 PDT 2002 keithp
+ Append a version number to cache filenames

View File

@ -1,5 +1,5 @@
/*
* $XFree86: xc/lib/fontconfig/src/fclang.c,v 1.4 2002/07/12 21:06:03 keithp Exp $
* $XFree86: xc/lib/fontconfig/src/fclang.c,v 1.6 2002/08/22 18:53:22 keithp Exp $
*
* Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
*
@ -275,9 +275,10 @@ FcLangSetHasLang (const FcLangSet *ls, const FcChar8 *lang)
int i;
id = FcLangSetIndex (lang);
if (id >= 0)
if (id < 0)
id = -id - 1;
else if (FcLangSetBitGet (ls, id))
return FcLangEqual;
id = -id - 1;
best = FcLangDifferentLang;
for (i = id - 1; i >= 0; i--)
{