warning fix

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

diff --git a/src/common/imaggif.cpp b/src/common/imaggif.cpp
index f719a2ad41dee11920c89b8d39943a71aa890f49..07a1067ca30469815187d96b1af7466042501b0a 100644 (file)
--- a/src/common/imaggif.cpp
+++ b/src/common/imaggif.cpp
@@ -3,16 +3,16 @@
 // Purpose:     wxGIFHandler
 // Author:      Vaclav Slavik & Guillermo Rodriguez Garcia
 // RCS-ID:      $Id$
 // Purpose:     wxGIFHandler
 // Author:      Vaclav Slavik & Guillermo Rodriguez Garcia
 // 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


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

-#if 1 // change this to #if wxUSE_GIF
+#if wxUSE_GIF

 
 

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

+#include "wx/intl.h"

 
 

-#if !USE_SHARED_LIBRARIES

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

-#endif
-
-#if wxUSE_STREAMS

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

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

 {
     wxGIFDecoder *decod;
 {
     wxGIFDecoder *decod;

+    int error;

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

-    
-    if (decod->ReadGIF() != E_OK)
+
+    if ((error = decod->ReadGIF()) != wxGIF_OK)

     {
         if (verbose)
     {
         if (verbose)

-            wxLogDebug(_T("Error reading GIF"));
-
+        {
+            switch (error)
+            {
+                case wxGIF_INVFORMAT: wxLogError(_("wxGIFHandler: error in GIF image format")); break;
+                case wxGIF_MEMERR:    wxLogError(_("wxGIFHandler: couldn't allocate enough memory")); break;
+                default:              wxLogError(_("wxGIFHandler: unknown error !!!"));
+            }
+        }

         delete decod;
         return FALSE;
     }
         delete decod;
         return FALSE;
     }


@@ -67,12 +72,12 @@ 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("wxGIFHandler is read-only!!"));

 
     return FALSE;
 }
 
 
     return FALSE;
 }
 

-bool wxGIFHandler::CanRead( wxInputStream& stream )
+bool wxGIFHandler::DoCanRead( wxInputStream& stream )

 {
     wxGIFDecoder *decod;
     bool ok;
 {
     wxGIFDecoder *decod;
     bool ok;


@@ -84,8 +89,6 @@ bool wxGIFHandler::CanRead( wxInputStream& stream )
     return ok;
 }
 
     return ok;
 }
 

-#endif
-  // wxUSE_STREAMS
+#endif  // wxUSE_STREAMS

 
 

-#endif
-  // wxUSE_GIF
+#endif  // wxUSE_GIF