// Purpose: wxGIFHandler
// Author: Vaclav Slavik & Guillermo Rodriguez Garcia
// RCS-ID: $Id$
+// Copyright: (c) 1999 Vaclav Slavik & Guillermo Rodriguez Garcia
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
*/
// For compilers that support precompilation, includes "wx.h".
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"
#ifdef __BORLANDC__
# pragma hdrstop
# include "wx/defs.h"
#endif
-#if 1 // change this to #if wxUSE_GIF
+#if wxUSE_GIF
#include "wx/image.h"
#include "wx/gifdecod.h"
#include "wx/wfstream.h"
-#include "wx/module.h"
#include "wx/log.h"
+#include "wx/intl.h"
#if !USE_SHARED_LIBRARIES
IMPLEMENT_DYNAMIC_CLASS(wxGIFHandler,wxImageHandler)
#endif
-#if wxUSE_STREAMS
-
//-----------------------------------------------------------------------------
// 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;
+ int error;
bool ok;
decod = new wxGIFDecoder(&stream, TRUE);
-
- if (decod->ReadGIF() != E_OK)
+
+ if ((error = decod->ReadGIF()) != wxGIF_OK)
{
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;
}
wxOutputStream& WXUNUSED(stream), bool verbose )
{
if (verbose)
- wxLogDebug(_T("wxGIFHandler is read-only!!"));
+ wxLogDebug(wxT("wxGIFHandler is read-only!!"));
return FALSE;
}
-bool wxGIFHandler::CanRead( wxInputStream& stream )
+bool wxGIFHandler::DoCanRead( wxInputStream& stream )
{
wxGIFDecoder *decod;
bool ok;
return ok;
}
-#endif
- // wxUSE_STREAMS
+#endif // wxUSE_STREAMS
-#endif
- // wxUSE_GIF
+#endif // wxUSE_GIF