diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-12-08 16:58:26 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-12-08 16:58:26 (GMT) |
| commit | 112110625756d20f1587d8486e1a5196fccd3871 (patch) | |
| tree | 09b1aeffb729d73564955bc7a8322c61a1b8deb4 /generic/tclEncoding.c | |
| parent | 4a5f73e33888553e2ae6c88a26fe08e0c33d0557 (diff) | |
| parent | 39bf69006a6847b4068bd3b9b8debda81197502a (diff) | |
| download | tcl-112110625756d20f1587d8486e1a5196fccd3871.zip tcl-112110625756d20f1587d8486e1a5196fccd3871.tar.gz tcl-112110625756d20f1587d8486e1a5196fccd3871.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'generic/tclEncoding.c')
| -rw-r--r-- | generic/tclEncoding.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c index 1e18ae5..475ec7c 100644 --- a/generic/tclEncoding.c +++ b/generic/tclEncoding.c @@ -622,13 +622,13 @@ TclInitEncodingSubsystem(void) type.freeProc = NULL; type.nullSize = 2; type.encodingName = "utf-16le"; - type.clientData = INT2PTR(1);; + type.clientData = INT2PTR(1); Tcl_CreateEncoding(&type); type.encodingName = "utf-16be"; type.clientData = INT2PTR(0); Tcl_CreateEncoding(&type); type.encodingName = "utf-16"; - type.clientData = INT2PTR(isLe.c);; + type.clientData = INT2PTR(isLe.c); Tcl_CreateEncoding(&type); #ifndef TCL_NO_DEPRECATED @@ -2409,13 +2409,13 @@ UtfToUtfProc( dst += Tcl_UniCharToUtf(*chPtr, dst); } else { src += TclUtfToUniChar(src, chPtr); - if ((*chPtr & 0xFC00) == 0xD800) { + if ((*chPtr | 0x3FF) == 0xDBFF) { /* A high surrogate character is detected, handle especially */ Tcl_UniChar low = *chPtr; if (src <= srcEnd-3) { Tcl_UtfToUniChar(src, &low); } - if ((low & 0xFC00) != 0xDC00) { + if ((low | 0x3FF) != 0xDFFF) { *dst++ = (char) (((*chPtr >> 12) | 0xE0) & 0xEF); *dst++ = (char) (((*chPtr >> 6) | 0x80) & 0xBF); *dst++ = (char) ((*chPtr | 0x80) & 0xBF); |