[patch] wx-png-1.5-2.diff

wx-png-1.5-2.diff (text/plain), 1.26 KB, created by Hanno Böck on 2011-02-18 11:10:35 UTC

--- src/common/imagpng.cpp	2010-04-15 06:26:32.000000000 +0200
+++ src/common/imagpng.cpp	2011-02-18 11:45:00.638335025 +0100
@@ -529,7 +529,7 @@
     png_structp png_ptr = png_create_read_struct
                           (
                             PNG_LIBPNG_VER_STRING,
-                            (voidp) NULL,
+                            NULL,
                             wx_png_error,
                             wx_png_warning
                           );
@@ -586,16 +586,18 @@
 #if wxUSE_PALETTE
     if (color_type == PNG_COLOR_TYPE_PALETTE)
     {
-        const size_t ncolors = info_ptr->num_palette;
+        int ncolors = 0;
+        png_colorp palette;
+        png_get_PLTE( png_ptr, info_ptr, &palette, &ncolors);
         unsigned char* r = new unsigned char[ncolors];
         unsigned char* g = new unsigned char[ncolors];
         unsigned char* b = new unsigned char[ncolors];
 
         for (size_t j = 0; j < ncolors; j++)
         {
-            r[j] = info_ptr->palette[j].red;
-            g[j] = info_ptr->palette[j].green;
-            b[j] = info_ptr->palette[j].blue;
+            r[j] = palette[j].red;
+            g[j] = palette[j].green;
+            b[j] = palette[j].blue;
         }
 
         image->SetPalette(wxPalette(ncolors, r, g, b));