fix bug introduced in r54646: we still need to count the embedded NULs when convertin...

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

diff --git a/src/common/imaggif.cpp b/src/common/imaggif.cpp
index c15f3bfc58332c1bcf6c01ad30059703f3077039..22a8dc04cca7c1ec2b2172f9a26a0c874510faaf 100644 (file)
--- a/src/common/imaggif.cpp
+++ b/src/common/imaggif.cpp
@@ -1,80 +1,105 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        imaggif.cpp
+// Name:        src/common/imaggif.cpp

 // Purpose:     wxGIFHandler
 // Purpose:     wxGIFHandler

-// Author:      Vaclav Slavik
-//              Based on wxGIFDecoder by Guillermo Rodriguez Garcia
+// Author:      Vaclav Slavik & Guillermo Rodriguez Garcia

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

+// Copyright:   (c) 1999 Vaclav Slavik & Guillermo Rodriguez Garcia

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // 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".
 // For compilers that support precompilation, includes "wx.h".

-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 
 #ifdef __BORLANDC__
 
 #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
 

-#include "wx/image.h"
+#include "wx/imaggif.h"

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

-#include "wx/module.h"
-#include "wx/log.h"

 
 IMPLEMENT_DYNAMIC_CLASS(wxGIFHandler,wxImageHandler)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxGIFHandler,wxImageHandler)
 

-#if wxUSE_STREAMS
-

 //-----------------------------------------------------------------------------
 // wxGIFHandler
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // wxGIFHandler
 //-----------------------------------------------------------------------------
 

-bool wxGIFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool WXUNUSED(verbose) )
+#if wxUSE_STREAMS
+
+bool wxGIFHandler::LoadFile(wxImage *image, wxInputStream& stream,
+                            bool verbose, int index)

 {
     wxGIFDecoder *decod;
 {
     wxGIFDecoder *decod;

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

 
 

-    decod = new wxGIFDecoder(&stream, TRUE);
-    
-    if (decod->ReadGIF() != E_OK)
+//    image->Destroy();
+    decod = new wxGIFDecoder();
+    error = decod->LoadGIF(stream);
+
+    if ((error != wxGIF_OK) && (error != wxGIF_TRUNCATED))

     {
     {

-        wxLogDebug(_T("Error reading GIF"));
+        if (verbose)
+        {
+            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;
         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;
 
     delete decod;

+

     return ok;
 }
 
 bool wxGIFHandler::SaveFile( wxImage * WXUNUSED(image),
                              wxOutputStream& WXUNUSED(stream), bool verbose )
 {
     return ok;
 }
 
 bool wxGIFHandler::SaveFile( wxImage * WXUNUSED(image),
                              wxOutputStream& WXUNUSED(stream), bool verbose )
 {

-    if (verbose) wxLogDebug(_T("wxGIFHandler is read-only!!"));
-    return FALSE;
+    if (verbose)
+        wxLogDebug(wxT("GIF: the handler is read-only!!"));
+
+    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
+#endif  // wxUSE_STREAMS
+
+#endif  // wxUSE_GIF