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

Test for stream validity in wxImage::GetImageCount()

Browse Source 
Use horse3.ani in image sample.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@18047 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-12-05 10:10:04 +00:00
parent 3801f213a8
commit 855a407f92
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
samples/image/image.cpp
View File

@@ -423,7 +423,7 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
yH = 2420 + image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y) ; yH = 2420 + image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y) ;
} }
m_ani_images = wxImage::GetImageCount ( dir + _T("horse.ani"), wxBITMAP_TYPE_ANI ); m_ani_images = wxImage::GetImageCount ( dir + _T("horse3.ani"), wxBITMAP_TYPE_ANI );
if (m_ani_images==0) if (m_ani_images==0)
wxLogError(wxT("No ANI-format images found")); wxLogError(wxT("No ANI-format images found"));
else else
@@ -432,7 +432,7 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
for (i=0; i < m_ani_images; i++) for (i=0; i < m_ani_images; i++)
{ {
image.Destroy(); image.Destroy();
if (!image.LoadFile( dir + _T("horse.ani"), wxBITMAP_TYPE_ANI, i )) if (!image.LoadFile( dir + _T("horse3.ani"), wxBITMAP_TYPE_ANI, i ))
{ {
wxString tmp = wxT("Can't load image number "); wxString tmp = wxT("Can't load image number ");
tmp << i ; tmp << i ;

5
src/common/image.cpp
View File

@@ -1005,7 +1005,10 @@ int wxImage::GetImageCount( const wxString &name, long type )
{ {
#if wxUSE_STREAMS #if wxUSE_STREAMS
wxFileInputStream stream(name); wxFileInputStream stream(name);
return GetImageCount(stream, type); if (!stream.Ok())
return 0;
else
return GetImageCount(stream, type);
#else #else
return 0; return 0;
#endif #endif