Warning fixes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30496 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/image/image.cpp b/samples/image/image.cpp
index 73d82e1cfda634c5ca77dabf299641c2bd71f25c..4d8d51e527eacb461ea55232b4174f2d12647c83 100644 (file)
--- a/samples/image/image.cpp
+++ b/samples/image/image.cpp
@@ -549,13 +549,14 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
     wxFile file(dir + _T("horse.bmp"));
     if ( file.IsOpened() )
     {
-        size_t len = (size_t)file.Length();
-        void *data = malloc(len);
-        if ( file.Read(data, len) != len )
+        wxFileOffset len = file.Length();
+        size_t dataSize = (size_t)len;
+        void *data = malloc(dataSize);
+        if ( file.Read(data, dataSize) != len )
             wxLogError(_T("Reading bitmap file failed"));
         else
         {
-            wxMemoryInputStream mis(data, len);
+            wxMemoryInputStream mis(data, dataSize);
             if ( !image.LoadFile(mis) )
                 wxLogError(wxT("Can't load BMP image from stream"));
             else

diff --git a/tests/archive/archivetest.cpp b/tests/archive/archivetest.cpp
index 3814b8ac8cb424572e072fe0aa8f65111a1baea9..476513e4f4df72e5306fcaef1a1d11c0ba3d5f63 100644 (file)
--- a/tests/archive/archivetest.cpp
+++ b/tests/archive/archivetest.cpp
@@ -1102,7 +1102,6 @@ void ArchiveTestCase<Classes>::VerifyDir(wxString& path, size_t rootlen /*=0*/)
                 it != m_testEntries.end());
 
             const TestEntry& testEntry = *it->second;
-            size_t size = 0;
 
 #ifndef __WXMSW__
             CPPUNIT_ASSERT_MESSAGE("timestamp check" + error_context,
@@ -1114,7 +1113,7 @@ void ArchiveTestCase<Classes>::VerifyDir(wxString& path, size_t rootlen /*=0*/)
                 CPPUNIT_ASSERT_MESSAGE(
                     "entry not found in archive" + error_entry, in.Ok());
 
-                size = in.GetLength();
+                size_t size = in.GetLength();
                 wxCharBuffer buf(size);
                 CPPUNIT_ASSERT_MESSAGE("Read" + error_context,
                     in.Read(buf.data(), size).LastRead() == size);