Compilo.

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

diff --git a/src/common/imaggif.cpp b/src/common/imaggif.cpp
index 74e573df34173d361ac0f14d8891f24e64064aa2..9d20c1847a5d1ac9d1a67af801bbfc53400ffb32 100644 (file)
--- a/src/common/imaggif.cpp
+++ b/src/common/imaggif.cpp
@@ -7,7 +7,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "imaggif.h"
 #endif
 
 #pragma implementation "imaggif.h"
 #endif
 


@@ -22,7 +22,7 @@
 #  include "wx/defs.h"
 #endif
 
 #  include "wx/defs.h"
 #endif
 

-#if wxUSE_GIF
+#if wxUSE_IMAGE && wxUSE_GIF

 
 #include "wx/imaggif.h"
 #include "wx/gifdecod.h"
 
 #include "wx/imaggif.h"
 #include "wx/gifdecod.h"


@@ -38,13 +38,15 @@ IMPLEMENT_DYNAMIC_CLASS(wxGIFHandler,wxImageHandler)
 
 #if wxUSE_STREAMS
 
 
 #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;
 {
     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 != wxGIF_OK) && (error != wxGIF_TRUNCATED))
     error = decod->ReadGIF();
 
     if ((error != wxGIF_OK) && (error != wxGIF_TRUNCATED))


@@ -54,30 +56,52 @@ bool wxGIFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose
             switch (error)
             {
                 case wxGIF_INVFORMAT:
             switch (error)
             {
                 case wxGIF_INVFORMAT:

-                    wxLogError(_("wxGIFHandler: error in GIF image format."));
+                    wxLogError(_("GIF: error in GIF image format."));

                     break;
                 case wxGIF_MEMERR:
                     break;
                 case wxGIF_MEMERR:

-                    wxLogError(_("wxGIFHandler: not enough memory."));
+                    wxLogError(_("GIF: not enough memory."));

                     break;
                 default:
                     break;
                 default:

-                    wxLogError(_("wxGIFHandler: unknown error!!!"));
+                    wxLogError(_("GIF: unknown error!!!"));

                     break;
             }
         }
         delete decod;
                     break;
             }
         }
         delete decod;

-        return FALSE;
+        return false;

     }
 
     if ((error == wxGIF_TRUNCATED) && verbose)
     {
     }
 
     if ((error == wxGIF_TRUNCATED) && verbose)
     {

-        wxLogWarning(_("wxGIFHandler: data stream seems to be truncated."));
+        wxLogError(_("GIF: data stream seems to be truncated."));

         /* go on; image data is OK */
     }
 
         /* go on; image data is OK */
     }
 

-    image->Destroy();
-    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;
 
     delete decod;

+

     return ok;
 }
 
     return ok;
 }
 


@@ -85,21 +109,15 @@ bool wxGIFHandler::SaveFile( wxImage * WXUNUSED(image),
                              wxOutputStream& WXUNUSED(stream), bool verbose )
 {
     if (verbose)
                              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 )
 {
 }
 
 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
 }
 
 #endif  // wxUSE_STREAMS