From: Julian Smart <julian@anthemion.co.uk>
Date: Thu, 2 Nov 2006 22:00:21 +0000 (+0000)
Subject: If the GIF isn't an animation, we can ignore the animation size, thus
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/551270a8953b739379f7a4149d02a48e411190e2

If the GIF isn't an animation, we can ignore the animation size, thus
suppressing false error.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42965 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/common/gifdecod.cpp b/src/common/gifdecod.cpp
index 0b53e9c627..3ca73d91a6 100644
--- a/src/common/gifdecod.cpp
+++ b/src/common/gifdecod.cpp
@@ -630,7 +630,7 @@ wxGIFErrorCode wxGIFDecoder::LoadGIF(wxInputStream& stream)
     m_szAnimation.SetWidth( buf[0] + 256 * buf[1] );
     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;
     }
@@ -755,8 +755,8 @@ wxGIFErrorCode wxGIFDecoder::LoadGIF(wxInputStream& stream)
             pimg->w = buf[4] + 256 * buf[5];
             pimg->h = buf[6] + 256 * buf[7];
 
-            if ((pimg->w == 0) || (pimg->w > (unsigned int)m_szAnimation.GetWidth()) || 
-                (pimg->h == 0) || (pimg->h > (unsigned int)m_szAnimation.GetHeight()))
+            if (anim && ((pimg->w == 0) || (pimg->w > (unsigned int)m_szAnimation.GetWidth()) || 
+			 (pimg->h == 0) || (pimg->h > (unsigned int)m_szAnimation.GetHeight())))
             {
                 Destroy();
                 return wxGIF_INVFORMAT;