X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/58c837a4e67c0996134cc0947691dc09c5f26687..4a45223c970eabf6ba66347129627775935c90b3:/src/common/imaggif.cpp diff --git a/src/common/imaggif.cpp b/src/common/imaggif.cpp index c487e75fa6..e152a6cbda 100644 --- a/src/common/imaggif.cpp +++ b/src/common/imaggif.cpp @@ -7,10 +7,9 @@ // 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" @@ -25,14 +24,13 @@ #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 //----------------------------------------------------------------------------- // wxGIFHandler @@ -46,27 +44,40 @@ bool wxGIFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose 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(_("GIF: Error in image format.")); break; - case E_MEMORIA: wxLogError(_("GIF: Couldn't allocate memory.")); break; - default: wxLogError(_("GIF: 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; } - 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; + return ok; } @@ -74,7 +85,7 @@ 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; } @@ -86,8 +97,8 @@ bool wxGIFHandler::DoCanRead( wxInputStream& stream ) decod = new wxGIFDecoder(&stream); ok = decod->CanRead(); - delete decod; + return ok; }