Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxDIB::Create(wxBitmap) shouldn't do any conversions if the bitmap is already a DIB section

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19785 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-03-24 22:58:50 +00:00
parent 9cf743aa7f
commit 82ac3b0a42
2 changed files with 73 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/msw/dib.cpp
View File

@@ -132,26 +132,48 @@ bool wxDIB::Create(const wxBitmap& bmp)
{
wxCHECK_MSG( bmp.Ok(), false, _T("wxDIB::Create(): invalid bitmap") );
const int w = bmp.GetWidth();
const int h = bmp.GetHeight();
int d = bmp.GetDepth();
if ( d == -1 )
d = wxDisplayDepth();
// this bitmap could already be a DIB section in which case we don't need
// to convert it to DIB
HBITMAP hbmp = GetHbitmapOf(bmp);
if ( !Create(w, h, d) )
return false;
// we could have used GetDIBits() too but GetBitmapBits() is simpler
if ( !::GetBitmapBits
(
GetHbitmapOf(bmp), // the source DDB
GetLineSize(w, d)*h, // the number of bytes to copy
m_data // the pixels will be copied here
) )
DIBSECTION ds;
if ( ::GetObject(hbmp, sizeof(ds), &ds) == sizeof(ds) )
{
wxLogLastError(wxT("GetDIBits()"));
m_handle = hbmp;
return 0;
// wxBitmap will free it, not we
m_ownsHandle = false;
// copy all the bitmap parameters too as we have them now anyhow
m_width = ds.dsBm.bmWidth;
m_height = ds.dsBm.bmHeight;
m_depth = ds.dsBm.bmBitsPixel;
m_data = ds.dsBm.bmBits;
}
else // no, it's a DDB -- convert it to DIB
{
const int w = bmp.GetWidth();
const int h = bmp.GetHeight();
int d = bmp.GetDepth();
if ( d == -1 )
d = wxDisplayDepth();
if ( !Create(w, h, d) )
return false;
// we could have used GetDIBits() too but GetBitmapBits() is simpler
if ( !::GetBitmapBits
(
GetHbitmapOf(bmp), // the source DDB
GetLineSize(w, d)*h, // the number of bytes to copy
m_data // the pixels will be copied here
) )
{
wxLogLastError(wxT("GetDIBits()"));
return 0;
}
}
return true;