Commit 5e0858cc authored by Brad King's avatar Brad King Committed by Kitware Robot
Browse files

Merge topic 'update-kwsys'

6f334159 Merge branch 'upstream-KWSys' into update-kwsys
47a8ff34

 KWSys 2017-05-23 (411e958f)
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !882
parents 56f87f17 6f334159
Pipeline #59829 passed with stage
in 0 seconds
......@@ -338,7 +338,7 @@ private:
}
bool decodeInputBuffer(const std::string buffer, std::wstring& wbuffer)
{
int length = int(buffer.length());
size_t length = buffer.length();
if (length == 0) {
wbuffer = std::wstring();
return true;
......@@ -353,11 +353,12 @@ private:
data += BOMsize;
length -= BOMsize;
}
const int wlength =
MultiByteToWideChar(actualCodepage, 0, data, length, NULL, 0);
const size_t wlength = static_cast<size_t>(MultiByteToWideChar(
actualCodepage, 0, data, static_cast<int>(length), NULL, 0));
wchar_t* wbuf = new wchar_t[wlength];
const bool success =
MultiByteToWideChar(actualCodepage, 0, data, length, wbuf, wlength) > 0
MultiByteToWideChar(actualCodepage, 0, data, static_cast<int>(length),
wbuf, static_cast<int>(wlength)) > 0
? true
: false;
wbuffer = std::wstring(wbuf, wlength);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment