X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8a68d8b6c13323ad187062b0be009f6d22af77f0..a22895511a250173cf7dd4403fc89f293a898067:/src/common/imaggif.cpp

diff --git a/src/common/imaggif.cpp b/src/common/imaggif.cpp
index f719a2ad41..22a8dc04cc 100644
--- a/src/common/imaggif.cpp
+++ b/src/common/imaggif.cpp
@@ -1,65 +1,87 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        imaggif.cpp
+// Name:        src/common/imaggif.cpp
 // Purpose:     wxGIFHandler
 // Author:      Vaclav Slavik & Guillermo Rodriguez Garcia
 // RCS-ID:      $Id$
+// Copyright:   (c) 1999 Vaclav Slavik & Guillermo Rodriguez Garcia
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-/*
-  We don't put pragma implement in this file because it is already present in
-  src/common/image.cpp
-*/
-
 // For compilers that support precompilation, includes "wx.h".
-#include <wx/wxprec.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 1 // change this to #if wxUSE_GIF
-
-#include "wx/image.h"
+#include "wx/imaggif.h"
 #include "wx/gifdecod.h"
 #include "wx/wfstream.h"
-#include "wx/module.h"
-#include "wx/log.h"
 
-#if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxGIFHandler,wxImageHandler)
-#endif
-
-#if wxUSE_STREAMS
 
 //-----------------------------------------------------------------------------
 // wxGIFHandler
 //-----------------------------------------------------------------------------
 
-bool wxGIFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose )
+#if wxUSE_STREAMS
+
+bool wxGIFHandler::LoadFile(wxImage *image, wxInputStream& stream,
+                            bool verbose, int index)
 {
     wxGIFDecoder *decod;
-    bool ok;
+    wxGIFErrorCode error;
+    bool ok = true;
+
+//    image->Destroy();
+    decod = new wxGIFDecoder();
+    error = decod->LoadGIF(stream);
 
-    decod = new wxGIFDecoder(&stream, TRUE);
-    
-    if (decod->ReadGIF() != E_OK)
+    if ((error != wxGIF_OK) && (error != wxGIF_TRUNCATED))
     {
         if (verbose)
-            wxLogDebug(_T("Error reading GIF"));
-
+        {
+            switch (error)
+            {
+                case wxGIF_INVFORMAT:
+                    wxLogError(_("GIF: error in GIF image format."));
+                    break;
+                case wxGIF_MEMERR:
+                    wxLogError(_("GIF: not enough memory."));
+                    break;
+                default:
+                    wxLogError(_("GIF: unknown error!!!"));
+                    break;
+            }
+        }
         delete decod;
-        return FALSE;
+        return false;
     }
 
-    image->Destroy();
-    ok = decod->ConvertToImage(image);
+    if ((error == wxGIF_TRUNCATED) && verbose)
+    {
+        wxLogError(_("GIF: data stream seems to be truncated."));
+        /* go on; image data is OK */
+    }
+
+    if (ok)
+    {
+        ok = decod->ConvertToImage(index != -1 ? (size_t)index : 0, image);
+    }
+    else
+    {
+        wxLogError(_("GIF: Invalid gif index."));
+    }
 
     delete decod;
+
     return ok;
 }
 
@@ -67,25 +89,17 @@ bool wxGIFHandler::SaveFile( wxImage * WXUNUSED(image),
                              wxOutputStream& WXUNUSED(stream), bool verbose )
 {
     if (verbose)
-        wxLogDebug(_T("wxGIFHandler is read-only!!"));
+        wxLogDebug(wxT("GIF: the handler is read-only!!"));
 
-    return FALSE;
+    return false;
 }
 
-bool wxGIFHandler::CanRead( wxInputStream& stream )
+bool wxGIFHandler::DoCanRead( wxInputStream& stream )
 {
-    wxGIFDecoder *decod;
-    bool ok;
-
-    decod = new wxGIFDecoder(&stream);
-    ok = decod->CanRead();
-
-    delete decod;
-    return ok;
+    wxGIFDecoder decod;
+    return decod.CanRead(stream);
 }
 
-#endif
-  // wxUSE_STREAMS
+#endif  // wxUSE_STREAMS
 
-#endif
-  // wxUSE_GIF
+#endif  // wxUSE_GIF