X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0141d2c9bd1033b773847447029f4598b7d9e90e..3b01b1fe4cb656f39290bf7f3891667855abe601:/src/common/imaggif.cpp diff --git a/src/common/imaggif.cpp b/src/common/imaggif.cpp index 717e967390..9d20c1847a 100644 --- a/src/common/imaggif.cpp +++ b/src/common/imaggif.cpp @@ -7,7 +7,7 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "imaggif.h" #endif @@ -22,7 +22,7 @@ # include "wx/defs.h" #endif -#if wxUSE_GIF +#if wxUSE_IMAGE && wxUSE_GIF #include "wx/imaggif.h" #include "wx/gifdecod.h" @@ -38,14 +38,15 @@ IMPLEMENT_DYNAMIC_CLASS(wxGIFHandler,wxImageHandler) #if wxUSE_STREAMS -bool wxGIFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose, int WXUNUSED(index) ) +bool wxGIFHandler::LoadFile(wxImage *image, wxInputStream& stream, + bool verbose, int index) { wxGIFDecoder *decod; int error; - bool ok; + bool ok = true; // image->Destroy(); - decod = new wxGIFDecoder(&stream, TRUE); + decod = new wxGIFDecoder(&stream, true); error = decod->ReadGIF(); if ((error != wxGIF_OK) && (error != wxGIF_TRUNCATED)) @@ -55,27 +56,50 @@ bool wxGIFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose switch (error) { case wxGIF_INVFORMAT: - wxLogError(_("wxGIFHandler: error in GIF image format.")); + wxLogError(_("GIF: error in GIF image format.")); break; case wxGIF_MEMERR: - wxLogError(_("wxGIFHandler: not enough memory.")); + wxLogError(_("GIF: not enough memory.")); break; default: - wxLogError(_("wxGIFHandler: unknown error!!!")); + wxLogError(_("GIF: unknown error!!!")); break; } } delete decod; - return FALSE; + return false; } if ((error == wxGIF_TRUNCATED) && verbose) { - wxLogError(_("wxGIFHandler: data stream seems to be truncated.")); + wxLogError(_("GIF: data stream seems to be truncated.")); /* go on; image data is OK */ } - ok = decod->ConvertToImage(image); + if (index != -1) + { + // We're already on index = 0 by default. So no need + // to call GoFrame(0) then. On top of that GoFrame doesn't + // accept an index of 0. (Instead GoFirstFrame() should be used) + // Also if the gif image has only one frame, calling GoFrame(0) + // fails because GoFrame() only works with gif animations. + // (It fails if IsAnimation() returns false) + // All valid reasons to NOT call GoFrame when index equals 0. + if (index != 0) + { + ok = decod->GoFrame(index); + } + } + + if (ok) + { + ok = decod->ConvertToImage(image); + } + else + { + wxLogError(_("GIF: Invalid gif index.")); + } + delete decod; return ok; @@ -85,21 +109,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(&stream); + return decod.CanRead(); } #endif // wxUSE_STREAMS