Changes to the XRC library:

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

diff --git a/src/common/imaggif.cpp b/src/common/imaggif.cpp
index 32f0539bc22395b2117abec3e6adda227c76426b..b8a5229e2343eac696fbafb7e895d1ff03451b2b 100644 (file)
--- a/src/common/imaggif.cpp
+++ b/src/common/imaggif.cpp
@@ -7,13 +7,12 @@
 // 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
-*/
+#ifdef __GNUG__
+#pragma implementation "imaggif.h"
+#endif

 
 // 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__
 #  pragma hdrstop
 
 #ifdef __BORLANDC__
 #  pragma hdrstop


@@ -23,16 +22,15 @@
 #  include "wx/defs.h"
 #endif
 
 #  include "wx/defs.h"
 #endif
 

-#if 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/gifdecod.h"
 #include "wx/wfstream.h"
 #include "wx/log.h"

+#include "wx/intl.h"

 
 

-#if !USE_SHARED_LIBRARIES

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

-#endif

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


@@ -40,33 +38,46 @@ IMPLEMENT_DYNAMIC_CLASS(wxGIFHandler,wxImageHandler)
 
 #if wxUSE_STREAMS
 
 
 #if wxUSE_STREAMS
 

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

 {
     wxGIFDecoder *decod;
     int error;
     bool ok;
 
 {
     wxGIFDecoder *decod;
     int error;
     bool ok;
 

+//    image->Destroy();

     decod = new wxGIFDecoder(&stream, TRUE);
     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)
             {
         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;
     }
 
             }
         }
         delete decod;
         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 */
+    }

 
 

+    ok = decod->ConvertToImage(image);

     delete decod;
     delete decod;

+

     return ok;
 }
 
     return ok;
 }
 


@@ -74,20 +85,20 @@ bool wxGIFHandler::SaveFile( wxImage * WXUNUSED(image),
                              wxOutputStream& WXUNUSED(stream), bool verbose )
 {
     if (verbose)
                              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();
 {
     wxGIFDecoder *decod;
     bool ok;
 
     decod = new wxGIFDecoder(&stream);
     ok = decod->CanRead();

-

     delete decod;
     delete decod;

+

     return ok;
 }
 
     return ok;
 }