|
@@ -338,7 +338,7 @@ private:
|
|
|
}
|
|
}
|
|
|
bool decodeInputBuffer(const std::string buffer, std::wstring& wbuffer)
|
|
bool decodeInputBuffer(const std::string buffer, std::wstring& wbuffer)
|
|
|
{
|
|
{
|
|
|
- int length = int(buffer.length());
|
|
|
|
|
|
|
+ size_t length = buffer.length();
|
|
|
if (length == 0) {
|
|
if (length == 0) {
|
|
|
wbuffer = std::wstring();
|
|
wbuffer = std::wstring();
|
|
|
return true;
|
|
return true;
|
|
@@ -353,11 +353,12 @@ private:
|
|
|
data += BOMsize;
|
|
data += BOMsize;
|
|
|
length -= 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];
|
|
wchar_t* wbuf = new wchar_t[wlength];
|
|
|
const bool success =
|
|
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
|
|
? true
|
|
|
: false;
|
|
: false;
|
|
|
wbuffer = std::wstring(wbuf, wlength);
|
|
wbuffer = std::wstring(wbuf, wlength);
|