Fixed timing of malformed animated GIFs in wxHTML (patch #1926825 by Gennady Feller)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@52997 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2008-04-03 18:55:46 +00:00
parent 3d8b2865a1
commit f4e1026261
2 changed files with 9 additions and 2 deletions

View File

@@ -129,6 +129,7 @@ All (GUI):
- Fixed generic art provider to scale bitmaps down to client-specific
best size if needed.
- Made wxSpinCtrl::Reparent() in MSW and generic versions (Angelo Mottola)
- Fixed timing of malformed animated GIFs in wxHTML (Gennady Feller)
All (Unix):

View File

@@ -388,7 +388,10 @@ wxHtmlImageCell::wxHtmlImageCell(wxHtmlWindowInterface *windowIface,
if ( m_gifDecoder->IsAnimation() )
{
m_gifTimer = new wxGIFTimer(this);
m_gifTimer->Start(m_gifDecoder->GetDelay(0), true);
long delay = m_gifDecoder->GetDelay(0);
if ( delay == 0 )
delay = 1;
m_gifTimer->Start(delay, true);
}
else
{
@@ -522,7 +525,10 @@ void wxHtmlImageCell::AdvanceAnimation(wxTimer *timer)
win->Refresh(img.HasMask(), &rect);
}
timer->Start(m_gifDecoder->GetDelay(m_nCurrFrame), true);
long delay = m_gifDecoder->GetDelay(m_nCurrFrame);
if ( delay == 0 )
delay = 1;
timer->Start(delay, true);
}
void wxHtmlImageCell::Layout(int w)