Fixes for GNUPro 00r1

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

diff --git a/src/common/imaggif.cpp b/src/common/imaggif.cpp
index 785f91da5481f2d0a7921b7282586e11c9c713c7..b8a5229e2343eac696fbafb7e895d1ff03451b2b 100644 (file)
--- a/src/common/imaggif.cpp
+++ b/src/common/imaggif.cpp
@@ -1,19 +1,18 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        imaggif.cpp
 // Purpose:     wxGIFHandler
 /////////////////////////////////////////////////////////////////////////////
 // Name:        imaggif.cpp
 // 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
-*/
+#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,47 +22,86 @@ src/common/image.cpp
 #  include "wx/defs.h"
 #endif
 
 #  include "wx/defs.h"
 #endif
 

-#include "wx/image.h"
-// #include "wx/imaggif.h"
+#if wxUSE_IMAGE && wxUSE_GIF
+
+#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"
 #include "wx/log.h"

+#include "wx/intl.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 WXUNUSED(index) )

 {
     wxGIFDecoder *decod;
 {
     wxGIFDecoder *decod;

+    int error;

     bool ok;
 
     bool ok;
 

+//    image->Destroy();

     decod = new wxGIFDecoder(&stream, TRUE);
     decod = new wxGIFDecoder(&stream, TRUE);

-    
-    if (decod->ReadGIF() != E_OK)
+    error = decod->ReadGIF();
+
+    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;
         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;
 }
 
 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!!"));
+    if (verbose)
+        wxLogDebug(wxT("GIF: the handler is read-only!!"));
+

     return FALSE;
 }
 
     return FALSE;
 }
 

-#endif
+bool wxGIFHandler::DoCanRead( wxInputStream& stream )
+{
+    wxGIFDecoder *decod;
+    bool ok;
+
+    decod = new wxGIFDecoder(&stream);
+    ok = decod->CanRead();
+    delete decod;
+
+    return ok;
+}
+
+#endif  // wxUSE_STREAMS
+
+#endif  // wxUSE_GIF