From: Vadim Zeitlin Date: Sat, 30 Aug 2008 16:31:31 +0000 (+0000) Subject: avoid unnecessary heap allocation of BITMAPINFO struct X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/ee56d68c4519b3dbb087bc4893183a0bd3c0336c?ds=inline avoid unnecessary heap allocation of BITMAPINFO struct git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55377 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/msw/dib.cpp b/src/msw/dib.cpp index 3acfa95d26..35ddb6d72f 100644 --- a/src/msw/dib.cpp +++ b/src/msw/dib.cpp @@ -96,39 +96,33 @@ bool wxDIB::Create(int width, int height, int depth) depth = 24; // allocate memory for bitmap structures - static const int sizeHeader = sizeof(BITMAPINFOHEADER); + BITMAPINFO info; + wxZeroMemory(info); - BITMAPINFO *info = (BITMAPINFO *)malloc(sizeHeader); - wxCHECK_MSG( info, false, _T("malloc(BITMAPINFO) failed") ); - - memset(info, 0, sizeHeader); - - info->bmiHeader.biSize = sizeHeader; - info->bmiHeader.biWidth = width; + info.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + info.bmiHeader.biWidth = width; // we use positive height here which corresponds to a DIB with normal, i.e. // bottom to top, order -- normally using negative height (which means // reversed for MS and hence natural for all the normal people top to // bottom line scan order) could be used to avoid the need for the image // reversal in Create(image) but this doesn't work under NT, only Win9x! - info->bmiHeader.biHeight = height; + info.bmiHeader.biHeight = height; - info->bmiHeader.biPlanes = 1; - info->bmiHeader.biBitCount = (WORD)depth; - info->bmiHeader.biSizeImage = GetLineSize(width, depth)*height; + info.bmiHeader.biPlanes = 1; + info.bmiHeader.biBitCount = (WORD)depth; + info.bmiHeader.biSizeImage = GetLineSize(width, depth)*height; m_handle = ::CreateDIBSection ( 0, // hdc (unused with DIB_RGB_COLORS) - info, // bitmap description + &info, // bitmap description DIB_RGB_COLORS, // use RGB, not palette &m_data, // [out] DIB bits NULL, // don't use file mapping 0 // file mapping offset (not used here) ); - free(info); - if ( !m_handle ) { wxLogLastError(wxT("CreateDIBSection"));