summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2019-12-01 16:05:17 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2019-12-01 16:05:17 (GMT)
commit2156b8f27a1daba1ff6be50810e837283b9ec589 (patch)
treeac6c93ac33c779c84f5ea9fab7278394fdabb0e0 /generic
parent20c0cdf51c6a9cb24182ba805ea2f0f1e87e0a24 (diff)
downloadtk-2156b8f27a1daba1ff6be50810e837283b9ec589.zip
tk-2156b8f27a1daba1ff6be50810e837283b9ec589.tar.gz
tk-2156b8f27a1daba1ff6be50810e837283b9ec589.tar.bz2
In tkUnixFont, make sure that the utf-to-ucs2 encoder clamps at 0xFFFF. Use more uppercase hex-values where appropriate.
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 38f71ea..1a1efa1 100644
--- a/generic/tkUtil.c
+++ b/generic/tkUtil.c
@@ -1222,7 +1222,7 @@ TkUtfToUniChar(
Tcl_UniChar uniChar = 0;
int len = Tcl_UtfToUniChar(src, &uniChar);
- if ((uniChar & 0xFC00) == 0xD800) {
+ if ((sizeof(Tcl_UniChar) == 2) && ((uniChar & 0xFC00) == 0xD800)) {
Tcl_UniChar low = uniChar;
/* 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 */