X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9742d3cc186a90b7069d3393aea4f8c86e1e3f37..5c737c4c37eb7d0687e06e005678299fe8557bc4:/src/common/gifdecod.cpp

diff --git a/src/common/gifdecod.cpp b/src/common/gifdecod.cpp
index 923685e552..828afb82c8 100644
--- a/src/common/gifdecod.cpp
+++ b/src/common/gifdecod.cpp
@@ -126,6 +126,21 @@ bool wxGIFDecoder::ConvertToImage(wxImage *image) const
     else
         image->SetMask(FALSE);
 
+    if (pal)
+    {
+        unsigned char* r = new unsigned char[256];
+        unsigned char* g = new unsigned char[256];
+        unsigned char* b = new unsigned char[256];
+        for (i = 0; i < 256; i++)
+        {
+            r[i] = pal[3*i + 0];
+            g[i] = pal[3*i + 1];
+            b[i] = pal[3*i + 2];
+        }
+        image->SetPalette(wxPalette(256, r, g, b));
+        delete[] r; delete[] g; delete[] b;
+    }
+
     /* copy image data */
     for (i = 0; i < (GetWidth() * GetHeight()); i++, src++)
     {
@@ -317,10 +332,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 */
@@ -444,6 +464,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;
 }
 
@@ -476,10 +501,11 @@ 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;
+    GIFImage      **ppimg;
+	GIFImage      *pimg, *pprev;
 
     /* check GIF signature */
     if (!CanRead())