X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/995612e2abc1131458863ed1d3e55206df7c33de..12b5f4b4d2d8a07962da7ba3b78c8c1ec2634a67:/src/common/imaggif.cpp?ds=sidebyside diff --git a/src/common/imaggif.cpp b/src/common/imaggif.cpp index 94f404a507..22a8dc04cc 100644 --- a/src/common/imaggif.cpp +++ b/src/common/imaggif.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: imaggif.cpp +// Name: src/common/imaggif.cpp // Purpose: wxGIFHandler // Author: Vaclav Slavik & Guillermo Rodriguez Garcia // RCS-ID: $Id$ @@ -7,32 +7,25 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -/* - We don't put pragma implement in this file because it is already present in - src/common/image.cpp -*/ - // For compilers that support precompilation, includes "wx.h". -#include +#include "wx/wxprec.h" #ifdef __BORLANDC__ -# pragma hdrstop + #pragma hdrstop #endif +#if wxUSE_IMAGE && wxUSE_GIF + #ifndef WX_PRECOMP -# include "wx/defs.h" + #include "wx/intl.h" + #include "wx/log.h" #endif -#if wxUSE_GIF - -#include "wx/image.h" +#include "wx/imaggif.h" #include "wx/gifdecod.h" #include "wx/wfstream.h" -#include "wx/log.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxGIFHandler,wxImageHandler) -#endif //----------------------------------------------------------------------------- // wxGIFHandler @@ -40,33 +33,55 @@ IMPLEMENT_DYNAMIC_CLASS(wxGIFHandler,wxImageHandler) #if wxUSE_STREAMS -bool wxGIFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose ) +bool wxGIFHandler::LoadFile(wxImage *image, wxInputStream& stream, + bool verbose, int index) { wxGIFDecoder *decod; - int error; - bool ok; + wxGIFErrorCode error; + bool ok = true; - decod = new wxGIFDecoder(&stream, TRUE); +// image->Destroy(); + decod = new wxGIFDecoder(); + error = decod->LoadGIF(stream); - if ((error = decod->ReadGIF()) != E_OK) + if ((error != wxGIF_OK) && (error != wxGIF_TRUNCATED)) { if (verbose) { switch (error) { - case E_FORMATO: wxLogError(wxT("wxGIFHandler: error in image format")); break; - case E_MEMORIA: wxLogError(wxT("wxGIFHandler: couldn't allocate memory")); break; - default: wxLogError(wxT("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; + 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 */ + } + + if (ok) + { + ok = decod->ConvertToImage(index != -1 ? (size_t)index : 0, image); + } + else + { + wxLogError(_("GIF: Invalid gif index.")); + } delete decod; + return ok; } @@ -74,21 +89,15 @@ bool wxGIFHandler::SaveFile( wxImage * WXUNUSED(image), wxOutputStream& WXUNUSED(stream), bool verbose ) { if (verbose) - wxLogDebug(wxT("wxGIFHandler is read-only!!")); + wxLogDebug(wxT("GIF: the handler is read-only!!")); - return FALSE; + return false; } bool wxGIFHandler::DoCanRead( wxInputStream& stream ) { - wxGIFDecoder *decod; - bool ok; - - decod = new wxGIFDecoder(&stream); - ok = decod->CanRead(); - - delete decod; - return ok; + wxGIFDecoder decod; + return decod.CanRead(stream); } #endif // wxUSE_STREAMS