Project file updates; cast in strconv.cpp to compile with VC++ 6

[wxWidgets.git] / src / common / gifdecod.cpp

diff --git a/src/common/gifdecod.cpp b/src/common/gifdecod.cpp
index c08bf1fdf62a7f4810aff262100a143647ca4277..828afb82c8e864ac7c115a3c29499e905205b97e 100644 (file)
--- a/src/common/gifdecod.cpp
+++ b/src/common/gifdecod.cpp
@@ -126,9 +126,6 @@ bool wxGIFDecoder::ConvertToImage(wxImage *image) const
     else
         image->SetMask(FALSE);
 
-    // Set the palette
-    // Palette creation not yet implemented on wxGTK
-#ifndef __WXGTK__
     if (pal)
     {
         unsigned char* r = new unsigned char[256];
@@ -143,7 +140,6 @@ 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++)
@@ -469,9 +465,9 @@ int wxGIFDecoder::dgif(GIFImage *img, int interl, int bits)
     while (code != ab_fin);
 
 #ifdef __WXMAC__
-    delete [] ab_prefix ;       
-    delete [] ab_tail ;       
-    delete [] stack ;       
+    delete [] ab_prefix ;
+    delete [] ab_tail ;
+    delete [] stack ;
 #endif
     return 0;
 }
@@ -508,7 +504,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())