X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5b4f8dd5c0fe1bf44fb7971c669b036d4ad6eebe..e6ec579c77012dd0ff1e16b2385e2d3ccf1b911b:/src/common/gifdecod.cpp

diff --git a/src/common/gifdecod.cpp b/src/common/gifdecod.cpp
index 35c13c01f7..0a8a6f525b 100644
--- 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.03
-// RCS-ID:      
+// Version:     3.04
+// RCS-ID:      $Id$
 // Copyright:   (c) Guillermo Rodriguez Garcia
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -20,16 +20,15 @@
 #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"
- 
+
 
 //---------------------------------------------------------------------------
 // wxGIFDecoder constructor and destructor
@@ -132,7 +131,7 @@ bool wxGIFDecoder::ConvertToImage(wxImage *image) const
     return TRUE;
 }
 
-                 
+
 //---------------------------------------------------------------------------
 // Data accessors
 //---------------------------------------------------------------------------
@@ -203,7 +202,7 @@ bool wxGIFDecoder::GoNextFrame(bool cyclic)
     }
     else
         return FALSE;
-}            
+}
 
 bool wxGIFDecoder::GoPrevFrame(bool cyclic)
 {
@@ -294,7 +293,7 @@ int wxGIFDecoder::getcode(int bits, int ab_fin)
         /* adjust total number of bits extracted from the buffer */
         m_restbits = m_restbits + 8;
     }
-    
+
     /* find number of bits remaining for next code */
     m_restbits = (m_restbits - bits);
 
@@ -445,12 +444,9 @@ 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);
+    m_f->SeekI(-3, wxFromCurrent);
 
     return (memcmp(buf, "GIF", 3) == 0);
 }
@@ -480,7 +476,6 @@ int wxGIFDecoder::ReadGIF()
         return E_FORMATO;
 
     /* check for and animated GIF support (ver. >= 89a) */
-    m_f->SeekI(0, wxFromStart);
     m_f->Read(buf, 6);
 
     if (memcmp(buf + 3, "89a", 3) < 0)
@@ -510,7 +505,13 @@ int wxGIFDecoder::ReadGIF()
     pprev = NULL;
     pimg  = NULL;
 
+#if defined(__VISAGECPP__)
+// VA just can't stand while(1)
+    bool bOs2var = TRUE;
+    while(bOs2var)
+#else
     while (1)
+#endif
     {
         type = (unsigned char)m_f->GetC();
 
@@ -538,7 +539,7 @@ int wxGIFDecoder::ReadGIF()
             }
             else
             /* other extension, skip */
-            {   
+            {
                 while ((i = (unsigned char)m_f->GetC()) != 0)
                 {
                     /* This line should not be neccessary!
@@ -626,4 +627,4 @@ int wxGIFDecoder::ReadGIF()
     return E_OK;
 }
 
-#endif // wxUSE_STREAM
+#endif // wxUSE_STREAMS && wxUSE_GIF