Further work on wxDataViewListModel::Reset()

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

diff --git a/src/common/imaggif.cpp b/src/common/imaggif.cpp
index 950fa3fe215a70e4460041b2f80eaa357970579f..fdb9a4971d1af78c4521d8d47c9fe2bb64c1d961 100644 (file)
--- a/src/common/imaggif.cpp
+++ b/src/common/imaggif.cpp
@@ -1,34 +1,29 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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
 // Purpose:     wxGIFHandler
 // Author:      Vaclav Slavik & Guillermo Rodriguez Garcia
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik & Guillermo Rodriguez Garcia

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "imaggif.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#  pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_IMAGE && wxUSE_GIF
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#  include "wx/defs.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"

 #endif
 
 #endif
 

-#if wxUSE_IMAGE && wxUSE_GIF
-

 #include "wx/imaggif.h"
 #include "wx/gifdecod.h"
 #include "wx/wfstream.h"
 #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)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxGIFHandler,wxImageHandler)
 


@@ -42,12 +37,12 @@ bool wxGIFHandler::LoadFile(wxImage *image, wxInputStream& stream,
                             bool verbose, int index)
 {
     wxGIFDecoder *decod;
                             bool verbose, int index)
 {
     wxGIFDecoder *decod;

-    int error;
-    bool ok = TRUE;
+    wxGIFErrorCode error;
+    bool ok = true;

 
 //    image->Destroy();
 
 //    image->Destroy();

-    decod = new wxGIFDecoder(&stream, TRUE);
-    error = decod->ReadGIF();
+    decod = new wxGIFDecoder();
+    error = decod->LoadGIF(stream);

 
     if ((error != wxGIF_OK) && (error != wxGIF_TRUNCATED))
     {
 
     if ((error != wxGIF_OK) && (error != wxGIF_TRUNCATED))
     {


@@ -67,7 +62,7 @@ bool wxGIFHandler::LoadFile(wxImage *image, wxInputStream& stream,
             }
         }
         delete decod;
             }
         }
         delete decod;

-        return FALSE;
+        return false;

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


@@ -76,24 +71,9 @@ bool wxGIFHandler::LoadFile(wxImage *image, wxInputStream& stream,
         /* go on; image data is OK */
     }
 
         /* 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);
-        }
-    }
-

     if (ok)
     {
     if (ok)
     {

-        ok = decod->ConvertToImage(image);
+        ok = decod->ConvertToImage(index != -1 ? (size_t)index : 0, image);

     }
     else
     {
     }
     else
     {


@@ -109,15 +89,31 @@ bool wxGIFHandler::SaveFile( wxImage * WXUNUSED(image),
                              wxOutputStream& WXUNUSED(stream), bool verbose )
 {
     if (verbose)
                              wxOutputStream& WXUNUSED(stream), bool verbose )
 {
     if (verbose)

+    {

         wxLogDebug(wxT("GIF: the handler 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(&stream);
-    return decod.CanRead();
+    wxGIFDecoder decod;
+    return decod.CanRead(stream);
+         // it's ok to modify the stream position here
+}
+
+int wxGIFHandler::DoGetImageCount( wxInputStream& stream )
+{
+    wxGIFDecoder decod;
+    wxGIFErrorCode error = decod.LoadGIF(stream);
+    if ( (error != wxGIF_OK) && (error != wxGIF_TRUNCATED) )
+        return -1;
+
+    // NOTE: this function modifies the current stream position but it's ok
+    //       (see wxImageHandler::GetImageCount)
+
+    return decod.GetFrameCount();

 }
 
 #endif  // wxUSE_STREAMS
 }
 
 #endif  // wxUSE_STREAMS