X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3f4fc7967b595ea8257696baff78e1866511223d..de8c48cf464e67572ba2927dd9f7dfe9e7d3488f:/src/common/gifdecod.cpp diff --git a/src/common/gifdecod.cpp b/src/common/gifdecod.cpp index 5cec45e69b..c08bf1fdf6 100644 --- a/src/common/gifdecod.cpp +++ b/src/common/gifdecod.cpp @@ -127,6 +127,8 @@ bool wxGIFDecoder::ConvertToImage(wxImage *image) const image->SetMask(FALSE); // Set the palette + // Palette creation not yet implemented on wxGTK +#ifndef __WXGTK__ if (pal) { unsigned char* r = new unsigned char[256]; @@ -141,6 +143,7 @@ bool wxGIFDecoder::ConvertToImage(wxImage *image) const image->SetPalette(wxPalette(256, r, g, b)); delete[] r; delete[] g; delete[] b; } +#endif /* copy image data */ for (i = 0; i < (GetWidth() * GetHeight()); i++, src++) @@ -333,10 +336,15 @@ int wxGIFDecoder::getcode(int bits, int ab_fin) // int wxGIFDecoder::dgif(GIFImage *img, int interl, int bits) { +#ifdef __WXMAC__ + int *ab_prefix = new int[4096]; /* alphabet (prefixes) */ + int *ab_tail = new int[4096]; /* alphabet (tails) */ + int *stack = new int[4096]; /* decompression stack */ +#else int ab_prefix[4096]; /* alphabet (prefixes) */ int ab_tail[4096]; /* alphabet (tails) */ int stack[4096]; /* decompression stack */ - +#endif int ab_clr; /* clear code */ int ab_fin; /* end of info code */ int ab_bits; /* actual symbol width, in bits */ @@ -460,6 +468,11 @@ int wxGIFDecoder::dgif(GIFImage *img, int interl, int bits) } while (code != ab_fin); +#ifdef __WXMAC__ + delete [] ab_prefix ; + delete [] ab_tail ; + delete [] stack ; +#endif return 0; } @@ -492,7 +505,7 @@ int wxGIFDecoder::ReadGIF() int ncolors, bits, interl, transparent, disposal, i; long size; long delay; - unsigned char type; + unsigned char type = 0; unsigned char pal[768]; unsigned char buf[16]; GIFImage **ppimg, *pimg, *pprev;