Warning fixes.

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

diff --git a/src/common/ffile.cpp b/src/common/ffile.cpp
index a208dacb3ec124536650a4eb82e72f79bd796045..7887d45fe5742f5c0f06d786788765049dec48b0 100644 (file)
--- a/src/common/ffile.cpp
+++ b/src/common/ffile.cpp
@@ -107,11 +107,14 @@ bool wxFFile::ReadAll(wxString *str)
 {
     wxCHECK_MSG( str, false, wxT("invalid parameter") );
     wxCHECK_MSG( IsOpened(), false, wxT("can't read from closed file") );
 {
     wxCHECK_MSG( str, false, wxT("invalid parameter") );
     wxCHECK_MSG( IsOpened(), false, wxT("can't read from closed file") );

+    wxCHECK_MSG( Length() >= 0, false, wxT("invalid length") );
+    size_t length = (size_t)Length();
+    wxCHECK_MSG( length == Length(), false, wxT("huge file not supported") );

 
     clearerr(m_fp);
 
     str->Empty();
 
     clearerr(m_fp);
 
     str->Empty();

-    str->Alloc(Length());
+    str->Alloc(length);

 
     wxChar buf[1024];
     static const size_t nSize = WXSIZEOF(buf) - 1; // -1 for trailing '\0'
 
     wxChar buf[1024];
     static const size_t nSize = WXSIZEOF(buf) - 1; // -1 for trailing '\0'


@@ -206,16 +209,18 @@ bool wxFFile::Seek(wxFileOffset ofs, wxSeekMode mode)
             break;
     }
 
             break;
     }
 

-#ifndef HAVE_FSEEKO 
+#ifndef HAVE_FSEEKO

     if ((long)ofs != ofs)
     {
         wxLogError(_("Seek error on file '%s' (large files not supported by stdio)"), m_name.c_str());
 
         return false;
     }
     if ((long)ofs != ofs)
     {
         wxLogError(_("Seek error on file '%s' (large files not supported by stdio)"), m_name.c_str());
 
         return false;
     }

-#endif

 
 

+    if ( wxFseek(m_fp, (long)ofs, origin) != 0 )
+#else

     if ( wxFseek(m_fp, ofs, origin) != 0 )
     if ( wxFseek(m_fp, ofs, origin) != 0 )

+#endif

     {
         wxLogSysError(_("Seek error on file '%s'"), m_name.c_str());
 
     {
         wxLogSysError(_("Seek error on file '%s'"), m_name.c_str());
 


@@ -260,7 +265,7 @@ wxFileOffset wxFFile::Length() const
         }
     }
 
         }
     }
 

-    return wxInvalidOffset; 
+    return wxInvalidOffset;

 }
 
 #endif // wxUSE_FFILE
 }
 
 #endif // wxUSE_FFILE

diff --git a/src/common/imagbmp.cpp b/src/common/imagbmp.cpp
index b4e8208c47e373e55098cb7bc002a8903723fc19..6e4168e0f006041308876fcaeac15d0fd31ed75f 100644 (file)
--- a/src/common/imagbmp.cpp
+++ b/src/common/imagbmp.cpp
@@ -278,7 +278,7 @@ bool wxBMPHandler::SaveDib(wxImage *image,
         for ( int i = 0; i < palette_size; i++ )
         {
             // if 1BPP_BW then the value should be either 0 or 255
         for ( int i = 0; i < palette_size; i++ )
         {
             // if 1BPP_BW then the value should be either 0 or 255

-            wxUint8 c = (i > 0) && (format == wxBMP_1BPP_BW) ? 255 : i;
+            wxUint8 c = (wxUint8)((i > 0) && (format == wxBMP_1BPP_BW) ? 255 : i);

 
             rgbquad[i*4] =
             rgbquad[i*4+1] =
 
             rgbquad[i*4] =
             rgbquad[i*4+1] =