X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/82b99cf952504cd5c6e6c1f6f93756c609f2905c..f5766910b6731eb03e82371416e9778203396ce7:/src/common/fileback.cpp

diff --git a/src/common/fileback.cpp b/src/common/fileback.cpp
index 23d60c349a..3e35315984 100644
--- a/src/common/fileback.cpp
+++ b/src/common/fileback.cpp
@@ -16,13 +16,13 @@
 
 #if wxUSE_BACKINGFILE
 
+#include "wx/fileback.h"
+
 #ifndef WX_PRECOMP
-    #include "wx/stream.h"
     #include "wx/utils.h"
     #include "wx/log.h"
 #endif
 
-#include "wx/fileback.h"
 #include "wx/private/filename.h"
 
 // Prefer wxFFile unless wxFile has large file support but wxFFile does not.
@@ -83,7 +83,7 @@ wxBackingFileImpl::wxBackingFileImpl(wxInputStream *stream,
     wxFileOffset len = m_stream->GetLength();
 
     if (len >= 0 && len + size_t(0) < m_bufsize)
-        m_bufsize = len;
+        m_bufsize = size_t(len);
 
     if (m_bufsize)
         m_buf = new char[m_bufsize];
@@ -114,7 +114,7 @@ wxStreamError wxBackingFileImpl::ReadAt(wxFileOffset pos,
         size1 = reqestedSize;
         size2 = 0;
     } else if (pos < m_filelen) {
-        size1 = m_filelen - pos;
+        size1 = size_t(m_filelen - pos);
         size2 = reqestedSize - size1;
     } else {
         size1 = 0;
@@ -203,7 +203,7 @@ wxStreamError wxBackingFileImpl::ReadAt(wxFileOffset pos,
             }
 
             // 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);
 
             memcpy((char*)buffer + *size, m_buf + start, len);