Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Warning fixes.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31594 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-01-25 15:49:14 +00:00
parent 7a46263195
commit 11846af338
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/common/ffile.cpp
View File

@@ -107,11 +107,14 @@ bool wxFFile::ReadAll(wxString *str)
{ {
wxCHECK_MSG( str, false, wxT("invalid parameter") ); wxCHECK_MSG( str, false, wxT("invalid parameter") );
wxCHECK_MSG( IsOpened(), false, wxT("can't read from closed file") ); 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); clearerr(m_fp);
str->Empty(); str->Empty();
str->Alloc(Length()); str->Alloc(length);
wxChar buf[1024]; wxChar buf[1024];
static const size_t nSize = WXSIZEOF(buf) - 1; // -1 for trailing '\0' 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) if ((long)ofs != ofs)
{ {
wxLogError(_("Seek error on file '%s' (large files not supported by stdio)"), m_name.c_str()); wxLogError(_("Seek error on file '%s' (large files not supported by stdio)"), m_name.c_str());
return false; 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

2
src/common/imagbmp.cpp
View File

@@ -278,7 +278,7 @@ bool wxBMPHandler::SaveDib(wxImage *image,
for ( int i = 0; i < palette_size; i++ ) for ( int i = 0; i < palette_size; i++ )
{ {
// if 1BPP_BW then the value should be either 0 or 255 // 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] =
rgbquad[i*4+1] = rgbquad[i*4+1] =