RemoveAt() added to array classes

[wxWidgets.git] / src / common / gifdecod.cpp

diff --git a/src/common/gifdecod.cpp b/src/common/gifdecod.cpp
index 32a89223c3838334d6f7f72272d0fa535999bded..e8fcdc7514f06ad0dc13a4b6aa364d94511adfe3 100644 (file)
--- a/src/common/gifdecod.cpp
+++ b/src/common/gifdecod.cpp
@@ -2,8 +2,8 @@
 // Name:        gifdecod.cpp
 // Purpose:     wxGIFDecoder, GIF reader for wxImage and wxAnimation
 // Author:      Guillermo Rodriguez Garcia <guille@iies.es>
-// Version:     3.02
-// Last rev:    1999/08/18
+// Version:     3.03
+// RCS-ID:      
 // Copyright:   (c) Guillermo Rodriguez Garcia
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -20,14 +20,13 @@
 #endif
 
 #ifndef WX_PRECOMP
-#  include "wx/setup.h"
+#  include "wx/defs.h"
 #endif
 
-#if wxUSE_STREAMS
+#if wxUSE_STREAMS && wxUSE_GIF
 
 #include <stdlib.h>
 #include <string.h>
-#include "wx/defs.h"
 #include "wx/gifdecod.h"
  
 
@@ -445,9 +444,12 @@ int wxGIFDecoder::dgif(IMAGEN *img, int interl, int bits)
 bool wxGIFDecoder::CanRead()
 {
     unsigned char buf[3];
+    off_t pos;
 
+    pos = m_f->TellI();
     m_f->SeekI(0, wxFromStart);
     m_f->Read(buf, 3);
+    m_f->SeekI(pos, wxFromStart);
 
     return (memcmp(buf, "GIF", 3) == 0);
 }
@@ -541,8 +543,10 @@ int wxGIFDecoder::ReadGIF()
                     /* This line should not be neccessary!
                      * Some images are not loaded correctly
                      * without it. A bug in wxStream?
+                     * Yes. Fixed now.
                      */
                     // m_f->SeekI(m_f->TellI(), wxFromStart);
+
                     m_f->SeekI(i, wxFromCurrent);
                 }
             }
@@ -621,4 +625,4 @@ int wxGIFDecoder::ReadGIF()
     return E_OK;
 }
 
-#endif // wxUSE_STREAM
+#endif // wxUSE_STREAMS && wxUSE_GIF