From 9386cb75e34acb49cd9fac945e09cf002f22db2d Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Fri, 12 Nov 2004 14:08:31 +0000 Subject: [PATCH] Warning fixes. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30496 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/image/image.cpp | 9 +++++---- tests/archive/archivetest.cpp | 3 +-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/samples/image/image.cpp b/samples/image/image.cpp index 73d82e1..4d8d51e 100644 --- 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 3814b8a..476513e 100644 --- a/tests/archive/archivetest.cpp +++ b/tests/archive/archivetest.cpp @@ -1102,7 +1102,6 @@ void ArchiveTestCase::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::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); -- 2.7.4