632. Finish off the UTF-16 APIs in Xft, and fix the UTF-16 conversion code

in fontconfig (#A.1411, Keith Packard, Jungshik Shin).
This commit is contained in:
David Dawes 2002-12-14 01:59:38 +00:00
parent dbc56f0b3f
commit 45fb31aa91
1 changed files with 2 additions and 2 deletions

View File

@ -1,5 +1,5 @@
/* /*
* $XFree86: xc/lib/fontconfig/src/fcstr.c,v 1.7 2002/07/13 05:43:25 keithp Exp $ * $XFree86: xc/lib/fontconfig/src/fcstr.c,v 1.10 2002/08/31 22:17:32 keithp Exp $
* *
* Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
* *
@ -283,7 +283,7 @@ FcUtf16ToUcs4 (const FcChar8 *src_orig,
if ((b & 0xfc00) != 0xdc00) if ((b & 0xfc00) != 0xdc00)
return 0; return 0;
result = ((((FcChar32) a & 0x3ff) << 10) | result = ((((FcChar32) a & 0x3ff) << 10) |
((FcChar32) b & 0x3ff)) | 0x10000; ((FcChar32) b & 0x3ff)) + 0x10000;
} }
else else
result = a; result = a;