X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b9b32d5c4fd7156164b7c264d0f88dfe264851ba..2e2b69eececf83c7097435e1f4482cc153e8d82c:/src/common/imaggif.cpp

diff --git a/src/common/imaggif.cpp b/src/common/imaggif.cpp
index 7b3e5ba0df..9d20c1847a 100644
--- a/src/common/imaggif.cpp
+++ b/src/common/imaggif.cpp
@@ -7,13 +7,12 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-/*
-  We don't put pragma implement in this file because it is already present in
-  src/common/image.cpp
-*/
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma implementation "imaggif.h"
+#endif
 
 // For compilers that support precompilation, includes "wx.h".
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #  pragma hdrstop
@@ -23,48 +22,86 @@
 #  include "wx/defs.h"
 #endif
 
-#if wxUSE_STREAMS && wxUSE_GIF
+#if wxUSE_IMAGE && wxUSE_GIF
 
-#include "wx/image.h"
+#include "wx/imaggif.h"
 #include "wx/gifdecod.h"
 #include "wx/wfstream.h"
 #include "wx/log.h"
+#include "wx/intl.h"
 
-#if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxGIFHandler,wxImageHandler)
-#endif
 
 //-----------------------------------------------------------------------------
 // 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;
     int error;
-    bool ok;
+    bool ok = true;
 
-    decod = new wxGIFDecoder(&stream, TRUE);
+//    image->Destroy();
+    decod = new wxGIFDecoder(&stream, true);
+    error = decod->ReadGIF();
 
-    if ((error = decod->ReadGIF()) != E_OK)
-    {   
+    if ((error != wxGIF_OK) && (error != wxGIF_TRUNCATED))
+    {
         if (verbose)
         {
             switch (error)
             {
-                case E_FORMATO: wxLogError(_T("wxGIFHandler: error in image format")); break;
-                case E_MEMORIA: wxLogError(_T("wxGIFHandler: couldn't allocate memory")); break;
-                default:        wxLogError(_T("wxGIFHandler: unknown 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;
+    }
+
+    if ((error == wxGIF_TRUNCATED) && verbose)
+    {
+        wxLogError(_("GIF: data stream seems to be truncated."));
+        /* go on; image data is OK */
+    }
+
+    if (index != -1)
+    {
+        // We're already on index = 0 by default. So no need
+        // to call GoFrame(0) then. On top of that GoFrame doesn't
+        // accept an index of 0. (Instead GoFirstFrame() should be used)
+        // Also if the gif image has only one frame, calling GoFrame(0)
+        // fails because GoFrame() only works with gif animations.
+        // (It fails if IsAnimation() returns false)
+        // All valid reasons to NOT call GoFrame when index equals 0.
+        if (index != 0)
+        {
+            ok = decod->GoFrame(index);
+        }
     }
 
-    image->Destroy();
-    ok = decod->ConvertToImage(image);
+    if (ok)
+    {
+        ok = decod->ConvertToImage(image);
+    }
+    else
+    {
+        wxLogError(_("GIF: Invalid gif index."));
+    }
 
     delete decod;
+
     return ok;
 }
 
@@ -72,21 +109,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(&stream);
+    return decod.CanRead();
 }
 
-#endif  // wxUSE_STREAMS && wxUSE_GIF
+#endif  // wxUSE_STREAMS
+
+#endif  // wxUSE_GIF