From 982a6623f7de0d5eb82c18349f16c66cf2a55018 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Sun, 17 Sep 2006 11:43:17 +0000 Subject: [PATCH] [ 1558691 ] wxPNGHandler: Preserve palette git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41267 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/imagpng.cpp | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/common/imagpng.cpp b/src/common/imagpng.cpp index 67c41464ca..d4c1cdb59f 100644 --- a/src/common/imagpng.cpp +++ b/src/common/imagpng.cpp @@ -37,6 +37,7 @@ #include "wx/filefn.h" #include "wx/wfstream.h" #include "wx/intl.h" +#include "wx/palette.h" // For memcpy #include @@ -580,6 +581,29 @@ wxPNGHandler::LoadFile(wxImage *image, png_read_image( png_ptr, lines ); png_read_end( png_ptr, info_ptr ); + +#if wxUSE_PALETTE + if (color_type == PNG_COLOR_TYPE_PALETTE) + { + const size_t ncolors = info_ptr->num_palette; + 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; + } + + image->SetPalette(wxPalette(ncolors, r, g, b)); + delete[] r; + delete[] g; + delete[] b; + } +#endif // wxUSE_PALETTE + png_destroy_read_struct( &png_ptr, &info_ptr, (png_infopp) NULL ); // loaded successfully, now init wxImage with this data -- 2.45.2