From: Guillermo Rodriguez Garcia Date: Fri, 27 Aug 1999 16:00:13 +0000 (+0000) Subject: CanRead() now restores the stream to its previous state (potential X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/5b4f8dd5c0fe1bf44fb7971c669b036d4ad6eebe CanRead() now restores the stream to its previous state (potential bug when mixing with other handlers' CanRead() code.) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3507 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/common/gifdecod.cpp b/src/common/gifdecod.cpp index 32a89223c3..35c13c01f7 100644 --- a/src/common/gifdecod.cpp +++ b/src/common/gifdecod.cpp @@ -2,8 +2,8 @@ // Name: gifdecod.cpp // Purpose: wxGIFDecoder, GIF reader for wxImage and wxAnimation // Author: Guillermo Rodriguez Garcia -// Version: 3.02 -// Last rev: 1999/08/18 +// Version: 3.03 +// RCS-ID: // Copyright: (c) Guillermo Rodriguez Garcia // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -445,9 +445,12 @@ int wxGIFDecoder::dgif(IMAGEN *img, int interl, int bits) bool wxGIFDecoder::CanRead() { unsigned char buf[3]; + off_t pos; + pos = m_f->TellI(); m_f->SeekI(0, wxFromStart); m_f->Read(buf, 3); + m_f->SeekI(pos, wxFromStart); return (memcmp(buf, "GIF", 3) == 0); } @@ -541,8 +544,10 @@ int wxGIFDecoder::ReadGIF() /* This line should not be neccessary! * Some images are not loaded correctly * without it. A bug in wxStream? + * Yes. Fixed now. */ // m_f->SeekI(m_f->TellI(), wxFromStart); + m_f->SeekI(i, wxFromCurrent); } }