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

More image processing updates

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15413 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2002-05-07 22:27:10 +00:00
parent d84afea9d1
commit 1c9a789ed9
3 changed files with 129 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/os2/bitmap.cpp
View File

@@ -87,6 +87,10 @@ void wxBitmapRefData::Free()
void wxBitmap::Init()
{
m_bIsMono = FALSE;
//
// True for all bitmaps created from bits, wxImages, Xpms
//
m_bFlip = TRUE;
} // end of wxBitmap::Init
bool wxBitmap::CopyFromIconOrCursor(
@@ -265,7 +269,7 @@ wxBitmap::wxBitmap(
)
{
Init();
m_bFlip = FALSE;
(void)Create( nW
,nH
,nD
@@ -296,7 +300,7 @@ wxBitmap::wxBitmap(
)
{
Init();
m_bFlip = FALSE;
LoadFile( rFilename
,(int)lType
);
@@ -697,10 +701,6 @@ bool wxBitmap::CreateFromImage (
vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError);
}
//
// Debug stuff
//
hPSScreen = ::GpiCreatePS( vHabmain
,hDCScreen
,&vSize
@@ -1127,7 +1127,7 @@ wxBitmap wxBitmap::GetSubBitmap(
vBmih.cx = rRect.width;
vBmih.cy = rRect.height;
vBmih.cPlanes = 1;
vBmih.cBitCount = 1;
vBmih.cBitCount = 24;
HBITMAP hBmpMask = ::GpiCreateBitmap( hPSDst
,&vBmih
@@ -1292,7 +1292,7 @@ bool wxMask::Create(
vBmih.cx = rBitmap.GetWidth();
vBmih.cy = rBitmap.GetHeight();
vBmih.cPlanes = 1;
vBmih.cBitCount = 1;
vBmih.cBitCount = 24;
m_hMaskBitmap = ::GpiCreateBitmap( hPSDst
,&vBmih
@@ -1586,12 +1586,12 @@ HBITMAP wxInvertMask(
0, 0, nWidth, nHeight
};
memset(&vBmih, '\0', sizeof(BITMAPINFOHEADER2));
vBmih.cbFix = sizeof(BITMAPINFOHEADER2);
memset(&vBmih, '\0', 16);
vBmih.cbFix = 16;
vBmih.cx = nWidth;
vBmih.cy = nHeight;
vBmih.cPlanes = 1;
vBmih.cBitCount = 1;
vBmih.cBitCount = 24;
hBmpInvMask = ::GpiCreateBitmap( hPSDst
,&vBmih