End of stream reading stuff

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

diff --git a/src/common/gifdecod.cpp b/src/common/gifdecod.cpp
index c746a8574f276eda5a968ca2a562e1cbc76b3a08..923685e552d0838a52516db4fca9263ede7bc290 100644 (file)
--- a/src/common/gifdecod.cpp
+++ b/src/common/gifdecod.cpp
@@ -36,7 +36,7 @@
 
 wxGIFDecoder::wxGIFDecoder(wxInputStream *s, bool anim)
 {
 
 wxGIFDecoder::wxGIFDecoder(wxInputStream *s, bool anim)
 {

-    m_f = s;
+    m_f    = s;

     m_anim = anim;
 
     m_background = -1;
     m_anim = anim;
 
     m_background = -1;


@@ -69,6 +69,12 @@ void wxGIFDecoder::Destroy()
         delete pimg;
         pimg = paux;
     }
         delete pimg;
         pimg = paux;
     }

+
+    m_pimage  = NULL;
+    m_pfirst  = NULL;
+    m_plast   = NULL;
+    m_image   = 0;
+    m_nimages = 0;

 }
 
 
 }
 
 


@@ -643,7 +649,7 @@ int wxGIFDecoder::ReadGIF()
             if ((buf[8] & 0x80) == 0x80)
             {
                 ncolors = 2 << (buf[8] & 0x07);
             if ((buf[8] & 0x80) == 0x80)
             {
                 ncolors = 2 << (buf[8] & 0x07);

-                m_f->Read(pal, 3 * ncolors);
+                m_f->SeekI(3 * ncolors, wxFromCurrent);

             }
 
             /* initial code size */
             }
 
             /* initial code size */


@@ -655,7 +661,7 @@ int wxGIFDecoder::ReadGIF()
                 m_f->SeekI(i, wxFromCurrent);
             }
         }
                 m_f->SeekI(i, wxFromCurrent);
             }
         }

-        else if (type != 0x3B)
+        else if ((type != 0x3B) && (type != 00)) /* testing */

         {
             /* images are OK, but couldn't read to the end of the stream */
             return wxGIF_TRUNCATED;
         {
             /* images are OK, but couldn't read to the end of the stream */
             return wxGIF_TRUNCATED;