Catching up to latest thread changes

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

diff --git a/src/common/gifdecod.cpp b/src/common/gifdecod.cpp
index 047189cc519eafd9a20658bd4a5b311327d95cd6..0a8a6f525bf6e64d64bb279da17cdb7a8568c076 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.01
-// Last rev:    1999/08/14
+// 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
@@ -85,6 +84,9 @@ bool wxGIFDecoder::ConvertToImage(wxImage *image) const
     unsigned long i;
     int      transparent;
 
+    /* just in case... */
+    image->Destroy();
+
     /* create the image */
     image->Create(GetWidth(), GetHeight());
 
@@ -129,7 +131,7 @@ bool wxGIFDecoder::ConvertToImage(wxImage *image) const
     return TRUE;
 }
 
-                 
+
 //---------------------------------------------------------------------------
 // Data accessors
 //---------------------------------------------------------------------------
@@ -200,7 +202,7 @@ bool wxGIFDecoder::GoNextFrame(bool cyclic)
     }
     else
         return FALSE;
-}            
+}
 
 bool wxGIFDecoder::GoPrevFrame(bool cyclic)
 {
@@ -291,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);
 
@@ -436,6 +438,20 @@ int wxGIFDecoder::dgif(IMAGEN *img, int interl, int bits)
 }
 
 
+// CanRead:
+//  Returns TRUE if the file looks like a valid GIF, FALSE otherwise.
+//
+bool wxGIFDecoder::CanRead()
+{
+    unsigned char buf[3];
+
+    m_f->Read(buf, 3);
+    m_f->SeekI(-3, wxFromCurrent);
+
+    return (memcmp(buf, "GIF", 3) == 0);
+}
+
+
 // ReadGIF:
 //  Reads and decodes one or more GIF images, depending on whether
 //  animated GIF support is enabled. Can read GIFs with any bit
@@ -455,13 +471,13 @@ int wxGIFDecoder::ReadGIF()
     unsigned char buf[16];
     IMAGEN        **ppimg, *pimg, *pprev;
 
+    /* check GIF signature */
+    if (!CanRead())
+        return E_FORMATO;
 
-    /* check GIF signature and animated GIF support (ver. >= 89a) */
+    /* check for and animated GIF support (ver. >= 89a) */
     m_f->Read(buf, 6);
 
-    if (memcmp(buf, "GIF", 3) != 0)
-        return E_FORMATO;
-
     if (memcmp(buf + 3, "89a", 3) < 0)
         m_anim = FALSE;
 
@@ -489,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();
 
@@ -517,14 +539,16 @@ int wxGIFDecoder::ReadGIF()
             }
             else
             /* other extension, skip */
-            {   
+            {
                 while ((i = (unsigned char)m_f->GetC()) != 0)
                 {
                     /* 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);
                 }
             }
@@ -603,4 +627,4 @@ int wxGIFDecoder::ReadGIF()
     return E_OK;
 }
 
-#endif // wxUSE_STREAM
+#endif // wxUSE_STREAMS && wxUSE_GIF