X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9724f75af5b196e43bf8da6baf314f574fede429..23213f1811f2743efc9360d0b4b3a90a98d2b7e5:/src/common/gifdecod.cpp

diff --git a/src/common/gifdecod.cpp b/src/common/gifdecod.cpp
index 131c5ecb80..1cd7e9f827 100644
--- a/src/common/gifdecod.cpp
+++ b/src/common/gifdecod.cpp
@@ -126,20 +126,23 @@ bool wxGIFDecoder::ConvertToImage(wxImage *image) const
     else
         image->SetMask(FALSE);
 
+#if wxUSE_PALETTE
     if (pal)
     {
-        unsigned char* r = new unsigned char[256];
-        unsigned char* g = new unsigned char[256];
-        unsigned char* b = new unsigned char[256];
+        unsigned char r[256];
+        unsigned char g[256];
+        unsigned char b[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;
     }
+#endif // wxUSE_PALETTE
 
     /* copy image data */
     for (i = 0; i < (GetWidth() * GetHeight()); i++, src++)
@@ -332,23 +335,17 @@ 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 */
-    int ab_free;                /* first free position in alphabet */
-    int ab_max;                 /* last possible character in alphabet */
-    int pass;                   /* pass number in interlaced images */
-    int pos;                    /* index into decompresion stack */
-    unsigned int x, y;          /* position in image buffer */
+    int *ab_prefix = new int[4096]; /* alphabet (prefixes) */
+    int *ab_tail = new int[4096];   /* alphabet (tails) */
+    int *stack = new int[4096];     /* decompression stack */
+    int ab_clr;                     /* clear code */
+    int ab_fin;                     /* end of info code */
+    int ab_bits;                    /* actual symbol width, in bits */
+    int ab_free;                    /* first free position in alphabet */
+    int ab_max;                     /* last possible character in alphabet */
+    int pass;                       /* pass number in interlaced images */
+    int pos;                        /* index into decompresion stack */
+    unsigned int x, y;              /* position in image buffer */
 
     int code, readcode, lastcode, abcabca;
 
@@ -464,11 +461,10 @@ int wxGIFDecoder::dgif(GIFImage *img, int interl, int bits)
     }
     while (code != ab_fin);
 
-#ifdef __WXMAC__
-    delete [] ab_prefix ;       
-    delete [] ab_tail ;       
-    delete [] stack ;       
-#endif
+    delete [] ab_prefix ;
+    delete [] ab_tail ;
+    delete [] stack ;
+
     return 0;
 }
 
@@ -504,7 +500,8 @@ int wxGIFDecoder::ReadGIF()
     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())
@@ -594,8 +591,12 @@ int wxGIFDecoder::ReadGIF()
 
             /* fill in the data */
             m_f->Read(buf, 9);
+            pimg->left = buf[0] + 256 * buf[1];
+            pimg->top = buf[2] + 256 * buf[3];
+/*
             pimg->left = buf[4] + 256 * buf[5];
             pimg->top = buf[4] + 256 * buf[5];
+*/
             pimg->w = buf[4] + 256 * buf[5];
             pimg->h = buf[6] + 256 * buf[7];
             interl = ((buf[8] & 0x40)? 1 : 0);
@@ -652,6 +653,9 @@ int wxGIFDecoder::ReadGIF()
     /* try to read to the end of the stream */
     while (type != 0x3B)
     {
+        if (!m_f->IsOk())
+            return wxGIF_TRUNCATED;
+            
         type = (unsigned char)m_f->GetC();
 
         if (type == 0x21)