summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2019-11-29 15:49:45 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2019-11-29 15:49:45 (GMT)
commit20c0cdf51c6a9cb24182ba805ea2f0f1e87e0a24 (patch)
tree89b5f522e18a02d29819d43d15f4011e356b4214 /generic
parentc0b576a646d8471572ed27a7c27e147656cde09c (diff)
downloadtk-20c0cdf51c6a9cb24182ba805ea2f0f1e87e0a24.zip
tk-20c0cdf51c6a9cb24182ba805ea2f0f1e87e0a24.tar.gz
tk-20c0cdf51c6a9cb24182ba805ea2f0f1e87e0a24.tar.bz2
Fix [d4f5620f5d]: font-4.14 fails (font actual with unicode). Add another test-case for TCL_UTF_MAX>3
Diffstat (limited to 'generic')
-rw-r--r--generic/tkUtil.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/generic/tkUtil.c b/generic/tkUtil.c
index 33faab8..38f71ea 100644
--- a/generic/tkUtil.c
+++ b/generic/tkUtil.c
@@ -1227,7 +1227,7 @@ TkUtfToUniChar(
/* This can only happen if Tcl is compiled with TCL_UTF_MAX=4,
* or when a high surrogate character is detected in UTF-8 form */
int len2 = Tcl_UtfToUniChar(src+len, &low);
- if ((uniChar & 0xFC00) == 0xDC00) {
+ if ((low & 0xFC00) == 0xDC00) {
*chPtr = (((uniChar & 0x3FF) << 10) | (low & 0x3FF)) + 0x10000;
return len + len2;
}