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

continue with other handlers if some handler fails in LoadFile() after returning true from CanRead() (modified patch 1926226)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53048 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-04-06 15:31:18 +00:00
parent 6587411805
commit f71b0c2d56
1 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/common/image.cpp
View File

@@ -2159,13 +2159,19 @@ int wxImage::GetImageCount( wxInputStream &stream, long type )
if ( type == wxBITMAP_TYPE_ANY ) if ( type == wxBITMAP_TYPE_ANY )
{ {
wxList &list=GetHandlers(); const wxList& list = GetHandlers();
for (wxList::compatibility_iterator node = list.GetFirst(); node; node = node->GetNext()) for ( wxList::compatibility_iterator node = list.GetFirst();
node;
node = node->GetNext() )
{ {
handler=(wxImageHandler*)node->GetData(); handler = (wxImageHandler*)node->GetData();
if ( handler->CanRead(stream) ) if ( handler->CanRead(stream) )
return handler->GetImageCount(stream); {
const int count = handler->GetImageCount(stream);
if ( count >= 0 )
return count;
}
} }
@@ -2202,17 +2208,22 @@ bool wxImage::LoadFile( wxInputStream& stream, long type, int index )
if ( type == wxBITMAP_TYPE_ANY ) if ( type == wxBITMAP_TYPE_ANY )
{ {
wxList &list=GetHandlers(); const wxList& list = GetHandlers();
for ( wxList::compatibility_iterator node = list.GetFirst();
for ( wxList::compatibility_iterator node = list.GetFirst(); node; node = node->GetNext() ) node;
node = node->GetNext() )
{ {
handler=(wxImageHandler*)node->GetData(); handler = (wxImageHandler*)node->GetData();
if ( handler->CanRead(stream) ) if ( handler->CanRead(stream) &&
return handler->LoadFile(this, stream, true/*verbose*/, index); handler->LoadFile(this, stream, true/*verbose*/, index) )
{
return true;
}
} }
wxLogWarning( _("No handler found for image type.") ); wxLogWarning( _("No handler found for image type.") );
return false; return false;
} }