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

don't generate an endless stream of asserts for the 0-sized images

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15304 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-04-29 14:55:08 +00:00
parent 09443a269e
commit 08a15c0d89
1 changed files with 46 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
src/html/m_image.cpp
View File

@@ -385,65 +385,71 @@ wxHtmlImageCell::wxHtmlImageCell(wxWindow *window, wxFSFile *input,
m_physX = m_physY = -1; m_physX = m_physY = -1;
#endif #endif
if ( input ) if ( m_bmpW && m_bmpH )
{ {
wxInputStream *s = input->GetStream(); if ( input )
if ( s )
{ {
bool readImg = TRUE; wxInputStream *s = input->GetStream();
if ( s )
{
bool readImg = TRUE;
#if wxUSE_GIF && wxUSE_TIMER #if wxUSE_GIF && wxUSE_TIMER
if ( (input->GetLocation().Matches(wxT("*.gif")) || if ( (input->GetLocation().Matches(wxT("*.gif")) ||
input->GetLocation().Matches(wxT("*.GIF"))) && m_window ) input->GetLocation().Matches(wxT("*.GIF"))) && m_window )
{
m_gifDecoder = new wxGIFDecoder(s, TRUE);
if ( m_gifDecoder->ReadGIF() == wxGIF_OK )
{ {
wxImage img; m_gifDecoder = new wxGIFDecoder(s, TRUE);
if ( m_gifDecoder->ConvertToImage(&img) ) if ( m_gifDecoder->ReadGIF() == wxGIF_OK )
SetImage(img);
readImg = FALSE;
if ( m_gifDecoder->IsAnimation() )
{ {
m_gifTimer = new wxGIFTimer(this); wxImage img;
m_gifTimer->Start(m_gifDecoder->GetDelay(), TRUE); if ( m_gifDecoder->ConvertToImage(&img) )
SetImage(img);
readImg = FALSE;
if ( m_gifDecoder->IsAnimation() )
{
m_gifTimer = new wxGIFTimer(this);
m_gifTimer->Start(m_gifDecoder->GetDelay(), TRUE);
}
else
{
wxDELETE(m_gifDecoder);
}
} }
else else
{ {
wxDELETE(m_gifDecoder); wxDELETE(m_gifDecoder);
} }
} }
else
if ( readImg )
#endif // wxUSE_GIF && wxUSE_TIMER
{ {
wxDELETE(m_gifDecoder); wxImage image(*s, wxBITMAP_TYPE_ANY);
if ( image.Ok() )
SetImage(image);
} }
} }
}
if ( readImg ) else // input==NULL, use "broken image" bitmap
#endif // wxUSE_GIF && wxUSE_TIMER {
if ( m_bmpW == -1 && m_bmpH == -1 )
{ {
SetImage(wxImage(*s, wxBITMAP_TYPE_ANY)); m_bmpW = 29;
m_bmpH = 31;
} }
else
{
m_showFrame = TRUE;
if ( m_bmpW == -1 ) m_bmpW = 31;
if ( m_bmpH == -1 ) m_bmpH = 33;
}
m_bitmap = new wxBitmap(broken_image_xpm);
} }
} }
else // input==NULL, use "broken image" bitmap //else: ignore the 0-sized images used sometimes on the Web pages
{
if ( m_bmpW == -1 && m_bmpH == -1 )
{
m_bmpW = 29;
m_bmpH = 31;
}
else
{
m_showFrame = TRUE;
if ( m_bmpW == -1 ) m_bmpW = 31;
if ( m_bmpH == -1 ) m_bmpH = 33;
}
m_bitmap = new wxBitmap(broken_image_xpm);
}
m_Width = (int)(scale * (double)m_bmpW); m_Width = (int)(scale * (double)m_bmpW);
m_Height = (int)(scale * (double)m_bmpH); m_Height = (int)(scale * (double)m_bmpH);