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

Do a sanity check before reading. Otherwise, if trying to read a duff image file,

Browse Source 
the app can abort if you pass a specific image type, but simply show an error
message if you pass wxBITMAP_TYPE_ANY.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36019 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2005-10-26 14:08:43 +00:00
parent 90c0f5a958
commit dd9ea234f2
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/common/image.cpp
View File

@@ -1554,7 +1554,13 @@ bool wxImage::LoadFile( wxInputStream& stream, long type, int index )
return false;
}
return handler->LoadFile(this, stream, true/*verbose*/, index);
if (!handler->CanRead(stream))
{
wxLogError(_("Image file is not of type %d."), type);
return false;
}
else
return handler->LoadFile(this, stream, true/*verbose*/, index);
}
bool wxImage::LoadFile( wxInputStream& stream, const wxString& mimetype, int index )
@@ -1572,7 +1578,13 @@ bool wxImage::LoadFile( wxInputStream& stream, const wxString& mimetype, int ind
return false;
}
return handler->LoadFile( this, stream, true/*verbose*/, index );
if (!handler->CanRead(stream))
{
wxLogError(_("Image file is not of type %s."), (const wxChar*) mimetype);
return false;
}
else
return handler->LoadFile( this, stream, true/*verbose*/, index );
}
bool wxImage::SaveFile( wxOutputStream& stream, int type ) const