X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0141d2c9bd1033b773847447029f4598b7d9e90e..6627d4dfb7ee6b850e866f824b9bdd0d600b8c3e:/src/common/imaggif.cpp?ds=sidebyside

diff --git a/src/common/imaggif.cpp b/src/common/imaggif.cpp
index 717e967390..1aed9a28cb 100644
--- a/src/common/imaggif.cpp
+++ b/src/common/imaggif.cpp
@@ -22,7 +22,7 @@
 #  include "wx/defs.h"
 #endif
 
-#if wxUSE_GIF
+#if wxUSE_IMAGE && wxUSE_GIF
 
 #include "wx/imaggif.h"
 #include "wx/gifdecod.h"
@@ -38,11 +38,12 @@ 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;
+    bool ok = TRUE;
 
 //    image->Destroy();
     decod = new wxGIFDecoder(&stream, TRUE);
@@ -55,13 +56,13 @@ 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;
             }
         }
@@ -71,11 +72,34 @@ bool wxGIFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose
 
     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 (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);
+        }
+    }
+
+    if (ok)
+    {
+        ok = decod->ConvertToImage(image);
+    }
+    else
+    {
+        wxLogError(_("GIF: Invalid gif index."));
+    }
+
     delete decod;
 
     return ok;
@@ -85,21 +109,15 @@ 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;
 }
 
 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