No changes, just use properly const variable in wxBMPHandler code.

Initialize "data" pointer consistently with "alpha".

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76135 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2014-03-12 23:04:29 +00:00
parent 64deeb94b9
commit 01f0a544c9

View File

@ -354,9 +354,10 @@ bool wxBMPHandler::SaveDib(wxImage *image,
}
// pointer to the image data, use quantized if available
wxUint8 *data = (wxUint8*) image->GetData();
const unsigned char* const data = q_image && q_image->IsOk()
? q_image->GetData()
: image->GetData();
const unsigned char* const alpha = saveAlpha ? image->GetAlpha() : NULL;
if (q_image) if (q_image->IsOk()) data = (wxUint8*) q_image->GetData();
wxUint8 *buffer = new wxUint8[row_width];
memset(buffer, 0, row_width);