X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/464122b639263c81fcbd698bae3826313d2165a2..2fa7c206f68655f226e37ce1f1cc7e646e6c0bf2:/src/common/gifdecod.cpp diff --git a/src/common/gifdecod.cpp b/src/common/gifdecod.cpp index 047189cc51..66c9aad915 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.01 -// Last rev: 1999/08/14 +// Version: 3.04 +// RCS-ID: $Id$ // Copyright: (c) Guillermo Rodriguez Garcia // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -20,16 +20,15 @@ #endif #ifndef WX_PRECOMP -# include "wx/setup.h" +# include "wx/defs.h" #endif -#if wxUSE_STREAMS +#if wxUSE_STREAMS && wxUSE_GIF #include #include -#include "wx/defs.h" #include "wx/gifdecod.h" - + //--------------------------------------------------------------------------- // wxGIFDecoder constructor and destructor @@ -58,7 +57,7 @@ wxGIFDecoder::~wxGIFDecoder() void wxGIFDecoder::Destroy() { - IMAGEN *pimg, *paux; + GIFImage *pimg, *paux; pimg = m_pfirst; @@ -67,7 +66,7 @@ void wxGIFDecoder::Destroy() paux = pimg->next; free(pimg->p); free(pimg->pal); - free(pimg); + delete pimg; pimg = paux; } } @@ -85,6 +84,9 @@ bool wxGIFDecoder::ConvertToImage(wxImage *image) const unsigned long i; int transparent; + /* just in case... */ + image->Destroy(); + /* create the image */ image->Create(GetWidth(), GetHeight()); @@ -129,7 +131,7 @@ bool wxGIFDecoder::ConvertToImage(wxImage *image) const return TRUE; } - + //--------------------------------------------------------------------------- // Data accessors //--------------------------------------------------------------------------- @@ -200,7 +202,7 @@ bool wxGIFDecoder::GoNextFrame(bool cyclic) } else return FALSE; -} +} bool wxGIFDecoder::GoPrevFrame(bool cyclic) { @@ -280,10 +282,14 @@ int wxGIFDecoder::getcode(int bits, int ab_fin) code = ab_fin; break; } + + /* prefetch data */ + m_f->Read((void *) m_buffer, m_restbyte); + m_bufp = m_buffer; } /* read next byte and isolate the bits we need */ - m_lastbyte = (unsigned char)m_f->GetC(); + m_lastbyte = (unsigned char) (*m_bufp++); mask = (1 << (bits - m_restbits)) - 1; code = code + ((m_lastbyte & mask) << m_restbits); m_restbyte--; @@ -291,7 +297,7 @@ int wxGIFDecoder::getcode(int bits, int ab_fin) /* adjust total number of bits extracted from the buffer */ m_restbits = m_restbits + 8; } - + /* find number of bits remaining for next code */ m_restbits = (m_restbits - bits); @@ -303,7 +309,7 @@ int wxGIFDecoder::getcode(int bits, int ab_fin) // GIF decoding function. The initial code size (aka root size) // is 'bits'. Supports interlaced images (interl == 1). // -int wxGIFDecoder::dgif(IMAGEN *img, int interl, int bits) +int wxGIFDecoder::dgif(GIFImage *img, int interl, int bits) { int ab_prefix[4096]; /* alphabet (prefixes) */ int ab_tail[4096]; /* alphabet (tails) */ @@ -333,7 +339,7 @@ int wxGIFDecoder::dgif(IMAGEN *img, int interl, int bits) pass = 1; pos = x = y = 0; - /* reset static globals */ + /* reset decoder vars */ m_restbits = 0; m_restbyte = 0; m_lastbyte = 0; @@ -436,14 +442,28 @@ int wxGIFDecoder::dgif(IMAGEN *img, int interl, int bits) } +// CanRead: +// Returns TRUE if the file looks like a valid GIF, FALSE otherwise. +// +bool wxGIFDecoder::CanRead() +{ + unsigned char buf[3]; + + m_f->Read(buf, 3); + m_f->SeekI(-3, wxFromCurrent); + + return (memcmp(buf, "GIF", 3) == 0); +} + + // ReadGIF: // Reads and decodes one or more GIF images, depending on whether // animated GIF support is enabled. Can read GIFs with any bit // size (color depth), but the output images are always expanded // to 8 bits per pixel. Also, the image palettes always contain -// 256 colors, although some of them may be unused. Returns E_OK -// (== 0) on success, or an error code if something fails. Error -// codes are E_ARCHIVO, E_FORMATO, E_MEMORIA (see header file). +// 256 colors, although some of them may be unused. Returns GIF_OK +// (== 0) on success, or an error code if something fails (see +// header file for details) // int wxGIFDecoder::ReadGIF() { @@ -453,15 +473,15 @@ int wxGIFDecoder::ReadGIF() unsigned char type; unsigned char pal[768]; unsigned char buf[16]; - IMAGEN **ppimg, *pimg, *pprev; + GIFImage **ppimg, *pimg, *pprev; + /* check GIF signature */ + if (!CanRead()) + return wxGIF_INVFORMAT; - /* check GIF signature and animated GIF support (ver. >= 89a) */ + /* check for and animated GIF support (ver. >= 89a) */ m_f->Read(buf, 6); - if (memcmp(buf, "GIF", 3) != 0) - return E_FORMATO; - if (memcmp(buf + 3, "89a", 3) < 0) m_anim = FALSE; @@ -489,7 +509,13 @@ int wxGIFDecoder::ReadGIF() pprev = NULL; pimg = NULL; +#if defined(__VISAGECPP__) +// VA just can't stand while(1) + bool bOs2var = TRUE; + while(bOs2var) +#else while (1) +#endif { type = (unsigned char)m_f->GetC(); @@ -517,14 +543,16 @@ int wxGIFDecoder::ReadGIF() } else /* other extension, skip */ - { + { while ((i = (unsigned char)m_f->GetC()) != 0) { /* 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); } } @@ -534,12 +562,12 @@ int wxGIFDecoder::ReadGIF() if (type == 0x2C) { /* allocate memory for IMAGEN struct */ - pimg = (*ppimg) = (IMAGEN *) malloc(sizeof(IMAGEN)); + pimg = (*ppimg) = new GIFImage(); if (pimg == NULL) { Destroy(); - return E_MEMORIA; + return wxGIF_MEMERR; } /* fill in the data */ @@ -560,13 +588,13 @@ int wxGIFDecoder::ReadGIF() ppimg = &pimg->next; /* allocate memory for image and palette */ - pimg->p = (unsigned char *) malloc(size); + pimg->p = (unsigned char *) malloc((size_t)size); pimg->pal = (unsigned char *) malloc(768); if ((!pimg->p) || (!pimg->pal)) { Destroy(); - return E_MEMORIA; + return wxGIF_MEMERR; } /* load local color map if available, else use global map */ @@ -600,7 +628,7 @@ int wxGIFDecoder::ReadGIF() m_pimage = m_pfirst; } - return E_OK; + return wxGIF_OK; } -#endif // wxUSE_STREAM +#endif // wxUSE_STREAMS && wxUSE_GIF