// 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".
-#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/imaggif.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)
-#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;
+// image->Destroy();
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)
{
- 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(_("wxGIFHandler: error in GIF image format."));
+ break;
+ case wxGIF_MEMERR:
+ wxLogError(_("wxGIFHandler: not enough memory."));
+ break;
+ default:
+ wxLogError(_("wxGIFHandler: unknown error!!!"));
+ break;
}
}
delete decod;
return FALSE;
}
- image->Destroy();
- ok = decod->ConvertToImage(image);
+ if ((error == wxGIF_TRUNCATED) && verbose)
+ {
+ wxLogError(_("wxGIFHandler: data stream seems to be truncated."));
+ /* go on; image data is OK */
+ }
+ ok = decod->ConvertToImage(image);
delete decod;
+
return ok;
}
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;
decod = new wxGIFDecoder(&stream);
ok = decod->CanRead();
-
delete decod;
+
return ok;
}
-#endif
- // wxUSE_STREAMS
+#endif // wxUSE_STREAMS
-#endif
- // wxUSE_GIF
+#endif // wxUSE_GIF