Warning fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42336 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -83,7 +83,7 @@ wxBackingFileImpl::wxBackingFileImpl(wxInputStream *stream,
|
|||||||
wxFileOffset len = m_stream->GetLength();
|
wxFileOffset len = m_stream->GetLength();
|
||||||
|
|
||||||
if (len >= 0 && len + size_t(0) < m_bufsize)
|
if (len >= 0 && len + size_t(0) < m_bufsize)
|
||||||
m_bufsize = len;
|
m_bufsize = size_t(len);
|
||||||
|
|
||||||
if (m_bufsize)
|
if (m_bufsize)
|
||||||
m_buf = new char[m_bufsize];
|
m_buf = new char[m_bufsize];
|
||||||
@@ -114,7 +114,7 @@ wxStreamError wxBackingFileImpl::ReadAt(wxFileOffset pos,
|
|||||||
size1 = reqestedSize;
|
size1 = reqestedSize;
|
||||||
size2 = 0;
|
size2 = 0;
|
||||||
} else if (pos < m_filelen) {
|
} else if (pos < m_filelen) {
|
||||||
size1 = m_filelen - pos;
|
size1 = size_t(m_filelen - pos);
|
||||||
size2 = reqestedSize - size1;
|
size2 = reqestedSize - size1;
|
||||||
} else {
|
} else {
|
||||||
size1 = 0;
|
size1 = 0;
|
||||||
@@ -203,7 +203,7 @@ wxStreamError wxBackingFileImpl::ReadAt(wxFileOffset pos,
|
|||||||
}
|
}
|
||||||
|
|
||||||
// copy to the user's buffer
|
// copy to the user's buffer
|
||||||
size_t start = pos - m_filelen;
|
size_t start = size_t(pos - m_filelen);
|
||||||
size_t len = wxMin(m_buflen - start, reqestedSize - *size);
|
size_t len = wxMin(m_buflen - start, reqestedSize - *size);
|
||||||
|
|
||||||
memcpy((char*)buffer + *size, m_buf + start, len);
|
memcpy((char*)buffer + *size, m_buf + start, len);
|
||||||
|
Reference in New Issue
Block a user