X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e7c80f9e052d3d50b3d7780b21e55d8c5586cdea..d10e22fe8ad283f37b1809349028ffc282e393ce:/src/common/imagpng.cpp diff --git a/src/common/imagpng.cpp b/src/common/imagpng.cpp index 07f0c8ad54..da38225970 100644 --- a/src/common/imagpng.cpp +++ b/src/common/imagpng.cpp @@ -24,18 +24,20 @@ #if wxUSE_IMAGE && wxUSE_LIBPNG +#include "wx/imagpng.h" + #ifndef WX_PRECOMP #include "wx/log.h" #include "wx/app.h" + #include "wx/bitmap.h" + #include "wx/module.h" #endif -#include "wx/imagpng.h" -#include "wx/bitmap.h" #include "png.h" #include "wx/filefn.h" #include "wx/wfstream.h" #include "wx/intl.h" -#include "wx/module.h" +#include "wx/palette.h" // For memcpy #include @@ -103,7 +105,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxPNGHandler,wxImageHandler) #if wxUSE_STREAMS #ifndef PNGLINKAGEMODE - #if defined(__WATCOMC__) && ( defined(__WXMSW__) || defined(__WXMGL__) ) + #ifdef __WATCOMC__ // we need an explicit cdecl for Watcom, at least according to // // http://sf.net/tracker/index.php?func=detail&aid=651492&group_id=9863&atid=109863 @@ -579,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