X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0828c0875e1516e4bfc0aa5b0a84195a2ac92cca..1748289348c4c7dcc467edbf7192ade8a1b78921:/src/common/imaggif.cpp?ds=sidebyside diff --git a/src/common/imaggif.cpp b/src/common/imaggif.cpp index c6a775e15c..22a8dc04cc 100644 --- a/src/common/imaggif.cpp +++ b/src/common/imaggif.cpp @@ -1,78 +1,105 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: imaggif.cpp +// Name: src/common/imaggif.cpp // Purpose: wxGIFHandler -// Author: Vaclav Slavik -// Based on wxGIFDecoder by Guillermo Rodriguez Garcia +// Author: Vaclav Slavik & Guillermo Rodriguez Garcia // RCS-ID: $Id$ +// Copyright: (c) 1999 Vaclav Slavik & Guillermo Rodriguez Garcia // 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 -#include "wx/image.h" -// #include "wx/imaggif.h" +#include "wx/imaggif.h" #include "wx/gifdecod.h" #include "wx/wfstream.h" -#include "wx/module.h" -#include "wx/log.h" IMPLEMENT_DYNAMIC_CLASS(wxGIFHandler,wxImageHandler) -#if wxUSE_STREAMS - //----------------------------------------------------------------------------- // wxGIFHandler //----------------------------------------------------------------------------- -bool wxGIFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool WXUNUSED(verbose) ) +#if wxUSE_STREAMS + +bool wxGIFHandler::LoadFile(wxImage *image, wxInputStream& stream, + bool verbose, int index) { wxGIFDecoder *decod; - bool ok; + wxGIFErrorCode error; + bool ok = true; + +// image->Destroy(); + decod = new wxGIFDecoder(); + error = decod->LoadGIF(stream); - decod = new wxGIFDecoder(&stream, TRUE); - - if (decod->ReadGIF() != E_OK) + if ((error != wxGIF_OK) && (error != wxGIF_TRUNCATED)) { - wxLogDebug(_T("Error reading GIF")); + if (verbose) + { + switch (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; + } + + if ((error == wxGIF_TRUNCATED) && verbose) + { + wxLogError(_("GIF: data stream seems to be truncated.")); + /* go on; image data is OK */ } - image->Destroy(); - ok = decod->ConvertToImage(image); + if (ok) + { + ok = decod->ConvertToImage(index != -1 ? (size_t)index : 0, image); + } + else + { + wxLogError(_("GIF: Invalid gif index.")); + } delete decod; + return ok; } bool wxGIFHandler::SaveFile( wxImage * WXUNUSED(image), wxOutputStream& WXUNUSED(stream), bool verbose ) { - if (verbose) wxLogDebug(_T("wxGIFHandler is read-only!!")); - return FALSE; + if (verbose) + wxLogDebug(wxT("GIF: the handler is read-only!!")); + + return false; } -bool wxGIFHandler::CanRead( wxInputStream& stream ) +bool wxGIFHandler::DoCanRead( wxInputStream& stream ) { - unsigned char hdr[5]; - - stream.Read(&hdr, 5); - stream.SeekI(-5, wxFromCurrent); - return (hdr[0] == 'G' && hdr[1] == 'I' && hdr[2] == 'F' && hdr[3] == '8' && hdr[4] == '9'); + wxGIFDecoder decod; + return decod.CanRead(stream); } -#endif +#endif // wxUSE_STREAMS + +#endif // wxUSE_GIF