diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-03-21 20:28:49 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-03-21 20:28:49 (GMT) |
| commit | ebd469c2a80c1ea381dfb847e3e1a0f2301f1662 (patch) | |
| tree | 3388430203fb0f57230283656c0978bad499165f /generic/tclUtf.c | |
| parent | d8c1fbed81745d41d1e9d504b3eccdd12b58fee9 (diff) | |
| parent | 7afcb333c4c4b1e516261b8113cd18fc432679c8 (diff) | |
| download | tcl-ebd469c2a80c1ea381dfb847e3e1a0f2301f1662.zip tcl-ebd469c2a80c1ea381dfb847e3e1a0f2301f1662.tar.gz tcl-ebd469c2a80c1ea381dfb847e3e1a0f2301f1662.tar.bz2 | |
Merge 8.7. Also fix invalid reference to TclUtfToWChar, causing build failure
Diffstat (limited to 'generic/tclUtf.c')
| -rw-r--r-- | generic/tclUtf.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/generic/tclUtf.c b/generic/tclUtf.c index f5ae07a..8085955 100644 --- a/generic/tclUtf.c +++ b/generic/tclUtf.c @@ -580,9 +580,7 @@ Tcl_UtfToUniCharDString( } end += 4; while (p < end) { - if (((unsigned)(UCHAR(*p)-0x80)) < 0x20) { - ch = cp1252[UCHAR(*p++)-0x80]; - } else if (Tcl_UtfCharComplete(p, end-p)) { + if (Tcl_UtfCharComplete(p, end-p)) { p += TclUtfToUniChar(p, &ch); } else { ch = UCHAR(*p++); @@ -634,10 +632,8 @@ Tcl_UtfToUtf16DString( } end += 4; while (p < end) { - if (((unsigned)(UCHAR(*p)-0x80)) < 0x20) { - ch = cp1252[UCHAR(*p++)-0x80]; - } else if (Tcl_UtfCharComplete(p, end-p)) { - p += TclUtfToWChar(p, &ch); + if (Tcl_UtfCharComplete(p, end-p)) { + p += Tcl_UtfToUtf16(p, &ch); } else { ch = UCHAR(*p++); } |