From: David Dawes <dawes@xfree86.org>
Date: Sat, 14 Dec 2002 01:59:38 +0000 (+0000)
Subject: 632. Finish off the UTF-16 APIs in Xft, and fix the UTF-16 conversion code
X-Git-Tag: xf-4_2_99_3~3
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=45fb31aa9113b597878fc19d1463c078663540d9;p=fontconfig.git

632. Finish off the UTF-16 APIs in Xft, and fix the UTF-16 conversion code
    in fontconfig (#A.1411, Keith Packard, Jungshik Shin).
---

diff --git a/src/fcstr.c b/src/fcstr.c
index efb82e1..a51be35 100644
--- a/src/fcstr.c
+++ b/src/fcstr.c
@@ -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.
  *
@@ -283,7 +283,7 @@ FcUtf16ToUcs4 (const FcChar8	*src_orig,
 	if ((b & 0xfc00) != 0xdc00)
 	    return 0;
 	result = ((((FcChar32) a & 0x3ff) << 10) |
-		  ((FcChar32) b & 0x3ff)) | 0x10000;
+		  ((FcChar32) b & 0x3ff)) + 0x10000;
     }
     else
 	result = a;