Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change decode_utf16() to take wxChar16 instead of wxUint16

Browse Source 
Under Unix systems, this is the same thing, but under MSW, where
sizeof(wchar_t) == 2, this allows to pass wchar_t pointers to this
function without casts.

It also makes it consistent with wxDecodeSurrogate() and allows to get
rid of another ugly cast there.

No real changes.
This commit is contained in:
Vadim Zeitlin
2017-11-09 23:45:29 +01:00
parent 9d5ff447e1
commit 2ee199acac
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/strconv.cpp
View File

@@ -103,7 +103,7 @@ static size_t encode_utf16(wxUint32 input, wxUint16 *output)
}
}
static size_t decode_utf16(const wxUint16* input, wxUint32& output)
static size_t decode_utf16(const wxChar16* input, wxUint32& output)
{
if ((*input < 0xd800) || (*input > 0xdfff))
{
@@ -130,8 +130,7 @@ static size_t decode_utf16(const wxUint16* input, wxUint32& output)
static wxUint32 wxDecodeSurrogate(const wxChar16 **pSrc)
{
wxUint32 out;
const size_t
n = decode_utf16(reinterpret_cast<const wxUint16 *>(*pSrc), out);
const size_t n = decode_utf16(*pSrc, out);
if ( n == wxCONV_FAILED )
*pSrc = NULL;
else
@@ -1107,7 +1106,7 @@ wxMBConvStrictUTF8::FromWChar(char *dst, size_t dstLen,
// to 0, which is invalid as a second half of a surrogate, to ensure
// that we return an error when trying to convert a buffer ending with
// half of a surrogate.
wxUint16 tmp[2];
wchar_t tmp[2];
tmp[0] = wp[0];
tmp[1] = srcLen != 0 ? wp[1] : 0;
switch ( decode_utf16(tmp, code) )
@@ -1391,8 +1390,7 @@ size_t wxMBConvUTF8::FromWChar(char *buf, size_t n,
wxUint32 cc;
#ifdef WC_UTF16
// cast is ok for WC_UTF16
size_t pa = decode_utf16((const wxUint16 *)psz, cc);
size_t pa = decode_utf16(psz, cc);
// we could have consumed two input code units if we decoded a
// surrogate, so adjust the input pointer and, if necessary, the length