X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a91b47e800c78dbf8e91191ce3977d148a13f1fe..c27eab7e9ce512e052046886a33c5f5002d42573:/src/common/image.cpp?ds=sidebyside diff --git a/src/common/image.cpp b/src/common/image.cpp index 3bd976b987..151ba3b73e 100644 --- a/src/common/image.cpp +++ b/src/common/image.cpp @@ -36,6 +36,9 @@ extern "C" { #include "wx/intl.h" #include "wx/module.h" +// For memcpy +#include + #ifdef __SALFORDC__ #ifdef FAR #undef FAR @@ -256,9 +259,11 @@ char unsigned *wxImage::GetData() const return M_IMGDATA->m_data; } -void wxImage::SetData( char unsigned *WXUNUSED(data) ) +void wxImage::SetData( char unsigned *data ) { wxCHECK_RET( Ok(), "invalid image" ); + + memcpy(M_IMGDATA->m_data, data, M_IMGDATA->m_width * M_IMGDATA->m_height * 3); } void wxImage::SetMaskColour( unsigned char r, unsigned char g, unsigned char b )