X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0141d2c9bd1033b773847447029f4598b7d9e90e..c437b3f4e47b74715a2f2385d4862972babd7802:/src/common/imaggif.cpp

diff --git a/src/common/imaggif.cpp b/src/common/imaggif.cpp
index 717e967390..7b241bd6e1 100644
--- a/src/common/imaggif.cpp
+++ b/src/common/imaggif.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        imaggif.cpp
+// Name:        src/common/imaggif.cpp
 // Purpose:     wxGIFHandler
 // Author:      Vaclav Slavik & Guillermo Rodriguez Garcia
 // RCS-ID:      $Id$
@@ -7,28 +7,23 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "imaggif.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#  pragma hdrstop
+    #pragma hdrstop
 #endif
 
+#if wxUSE_IMAGE && wxUSE_GIF
+
 #ifndef WX_PRECOMP
-#  include "wx/defs.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
 #endif
 
-#if wxUSE_GIF
-
 #include "wx/imaggif.h"
 #include "wx/gifdecod.h"
 #include "wx/wfstream.h"
-#include "wx/log.h"
-#include "wx/intl.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxGIFHandler,wxImageHandler)
 
@@ -38,15 +33,16 @@ IMPLEMENT_DYNAMIC_CLASS(wxGIFHandler,wxImageHandler)
 
 #if wxUSE_STREAMS
 
-bool wxGIFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose, int WXUNUSED(index) )
+bool wxGIFHandler::LoadFile(wxImage *image, wxInputStream& stream,
+                            bool verbose, int index)
 {
     wxGIFDecoder *decod;
-    int error;
-    bool ok;
+    wxGIFErrorCode error;
+    bool ok = true;
 
 //    image->Destroy();
-    decod = new wxGIFDecoder(&stream, TRUE);
-    error = decod->ReadGIF();
+    decod = new wxGIFDecoder();
+    error = decod->LoadGIF(stream);
 
     if ((error != wxGIF_OK) && (error != wxGIF_TRUNCATED))
     {
@@ -55,27 +51,35 @@ bool wxGIFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose
             switch (error)
             {
                 case wxGIF_INVFORMAT:
-                    wxLogError(_("wxGIFHandler: error in GIF image format."));
+                    wxLogError(_("GIF: error in GIF image format."));
                     break;
                 case wxGIF_MEMERR:
-                    wxLogError(_("wxGIFHandler: not enough memory."));
+                    wxLogError(_("GIF: not enough memory."));
                     break;
                 default:
-                    wxLogError(_("wxGIFHandler: unknown error!!!"));
+                    wxLogError(_("GIF: unknown error!!!"));
                     break;
             }
         }
         delete decod;
-        return FALSE;
+        return false;
     }
 
     if ((error == wxGIF_TRUNCATED) && verbose)
     {
-        wxLogError(_("wxGIFHandler: data stream seems to be truncated."));
+        wxLogError(_("GIF: data stream seems to be truncated."));
         /* go on; image data is OK */
     }
 
-    ok = decod->ConvertToImage(image);
+    if (ok)
+    {
+        ok = decod->ConvertToImage(index != -1 ? (size_t)index : 0, image);
+    }
+    else
+    {
+        wxLogError(_("GIF: Invalid gif index."));
+    }
+
     delete decod;
 
     return ok;
@@ -85,21 +89,25 @@ bool wxGIFHandler::SaveFile( wxImage * WXUNUSED(image),
                              wxOutputStream& WXUNUSED(stream), bool verbose )
 {
     if (verbose)
-        wxLogDebug(wxT("wxGIFHandler is read-only!!"));
+        wxLogDebug(wxT("GIF: the handler is read-only!!"));
 
-    return FALSE;
+    return false;
 }
 
 bool wxGIFHandler::DoCanRead( wxInputStream& stream )
 {
-    wxGIFDecoder *decod;
-    bool ok;
+    wxGIFDecoder decod;
+    return decod.CanRead(stream);
+}
 
-    decod = new wxGIFDecoder(&stream);
-    ok = decod->CanRead();
-    delete decod;
+int wxGIFHandler::GetImageCount( wxInputStream& stream )
+{
+    wxGIFDecoder decod;
+    wxGIFErrorCode error = decod.LoadGIF(stream);
+    if ( (error != wxGIF_OK) && (error != wxGIF_TRUNCATED) )
+        return -1;
 
-    return ok;
+    return decod.GetFrameCount();
 }
 
 #endif  // wxUSE_STREAMS