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

If the GIF isn't an animation, we can ignore the animation size, thus

Browse Source 
suppressing false error.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42965 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2006-11-02 22:00:21 +00:00
parent ec2f62b19d
commit 551270a895
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/gifdecod.cpp
View File

@@ -630,7 +630,7 @@ wxGIFErrorCode wxGIFDecoder::LoadGIF(wxInputStream& stream)
m_szAnimation.SetWidth( buf[0] + 256 * buf[1] ); m_szAnimation.SetWidth( buf[0] + 256 * buf[1] );
m_szAnimation.SetHeight( buf[2] + 256 * buf[3] ); m_szAnimation.SetHeight( buf[2] + 256 * buf[3] );
if ((m_szAnimation.GetWidth() == 0) || (m_szAnimation.GetHeight() == 0)) if (anim && ((m_szAnimation.GetWidth() == 0) || (m_szAnimation.GetHeight() == 0)))
{ {
return wxGIF_INVFORMAT; return wxGIF_INVFORMAT;
} }
@@ -755,8 +755,8 @@ wxGIFErrorCode wxGIFDecoder::LoadGIF(wxInputStream& stream)
pimg->w = buf[4] + 256 * buf[5]; pimg->w = buf[4] + 256 * buf[5];
pimg->h = buf[6] + 256 * buf[7]; pimg->h = buf[6] + 256 * buf[7];
if ((pimg->w == 0) || (pimg->w > (unsigned int)m_szAnimation.GetWidth()) || if (anim && ((pimg->w == 0) || (pimg->w > (unsigned int)m_szAnimation.GetWidth()) ||
(pimg->h == 0) || (pimg->h > (unsigned int)m_szAnimation.GetHeight())) (pimg->h == 0) || (pimg->h > (unsigned int)m_szAnimation.GetHeight())))
{ {
Destroy(); Destroy();
return wxGIF_INVFORMAT; return wxGIF_INVFORMAT;