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

Bitmap updates

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15192 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2002-04-18 05:12:36 +00:00
parent d7fa7eaa2d
commit c354beeafa
3 changed files with 134 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

151
src/os2/bitmap.cpp
View File

@@ -173,7 +173,7 @@ wxBitmap::wxBitmap(
pRefData->m_nNumColors = 0; pRefData->m_nNumColors = 0;
pRefData->m_pSelectedInto = NULL; pRefData->m_pSelectedInto = NULL;
hDc = ::DevOpenDC(vHabmain, OD_MEMORY, (PSZ)"*", 1L, (PDEVOPENDATA)&vDop, 0L); hDc = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE);
hPs = ::GpiCreatePS(vHabmain, hDc, &vSize, GPIA_ASSOC | PU_PELS); hPs = ::GpiCreatePS(vHabmain, hDc, &vSize, GPIA_ASSOC | PU_PELS);
if (hPs == 0) if (hPs == 0)
{ {
@@ -226,31 +226,20 @@ wxBitmap::wxBitmap(
pzData = (char *)zBits; // const_cast is harmless pzData = (char *)zBits; // const_cast is harmless
} }
memset(&vHeader, '\0', sizeof(BITMAPINFOHEADER2)); memset(&vHeader, '\0', 16);
vHeader.cbFix = sizeof(vHeader); vHeader.cbFix = 16;
vHeader.cx = (USHORT)nWidth; vHeader.cx = (USHORT)nWidth;
vHeader.cy = (USHORT)nHeight; vHeader.cy = (USHORT)nHeight;
vHeader.cPlanes = 1L; vHeader.cPlanes = 1L;
vHeader.cBitCount = nDepth; vHeader.cBitCount = nDepth;
vHeader.usReserved = 0; vHeader.usReserved = 0;
vHeader.ulCompression = BCA_UNCOMP;
vHeader.usRecording = BRA_BOTTOMUP;
vHeader.usRendering = BRH_NOTHALFTONED;
vHeader.ulColorEncoding = BCE_RGB;
vHeader.ulIdentifier = 0;
memset(&vInfo, '\0', sizeof(BITMAPINFO2)); memset(&vInfo, '\0', 16);
vInfo.cbFix = sizeof(vInfo); vInfo.cbFix = 16;
vInfo.cx = (USHORT)nWidth; vInfo.cx = (USHORT)nWidth;
vInfo.cy = (USHORT)nHeight; vInfo.cy = (USHORT)nHeight;
vInfo.cPlanes = 1L; vInfo.cPlanes = 1L;
vInfo.cBitCount = nDepth; vInfo.cBitCount = nDepth;
vInfo.usReserved = 0;
vInfo.ulCompression = BCA_UNCOMP;
vInfo.usRecording = BRA_BOTTOMUP;
vInfo.usRendering = BRH_NOTHALFTONED;
vInfo.ulColorEncoding = BCE_RGB;
vInfo.ulIdentifier = 0;
HBITMAP hBmp = ::GpiCreateBitmap(hPs, &vHeader, CBM_INIT, (PBYTE)pzData, &vInfo); HBITMAP hBmp = ::GpiCreateBitmap(hPs, &vHeader, CBM_INIT, (PBYTE)pzData, &vInfo);
@@ -258,7 +247,8 @@ wxBitmap::wxBitmap(
{ {
wxLogLastError("CreateBitmap"); wxLogLastError("CreateBitmap");
} }
::WinReleasePS(hPs); ::GpiDestroyPS(hPs);
::DevCloseDC(hDc);
SetHBITMAP((WXHBITMAP)hBmp); SetHBITMAP((WXHBITMAP)hBmp);
} // end of wxBitmap::wxBitmap } // end of wxBitmap::wxBitmap
@@ -329,8 +319,8 @@ bool wxBitmap::Create(
HDC hDC = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE); HDC hDC = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE);
HPS hPS = ::GpiCreatePS(vHabmain, hDC, &vSize, PU_PELS | GPIA_ASSOC); HPS hPS = ::GpiCreatePS(vHabmain, hDC, &vSize, PU_PELS | GPIA_ASSOC);
memset(&vHeader, '\0', sizeof(BITMAPINFOHEADER2)); memset(&vHeader, '\0', 16);
vHeader.cbFix = sizeof(BITMAPINFOHEADER2); vHeader.cbFix = 16;
vHeader.cx = nW; vHeader.cx = nW;
vHeader.cy = nH; vHeader.cy = nH;
vHeader.cPlanes = 1; vHeader.cPlanes = 1;
@@ -355,8 +345,8 @@ bool wxBitmap::Create(
hDCScreen = ::GpiQueryDevice(hPSScreen); hDCScreen = ::GpiQueryDevice(hPSScreen);
::DevQueryCaps(hDCScreen, CAPS_COLOR_BITCOUNT, 1L, &lBitCount); ::DevQueryCaps(hDCScreen, CAPS_COLOR_BITCOUNT, 1L, &lBitCount);
memset(&vHeader, '\0', sizeof(BITMAPINFOHEADER2)); memset(&vHeader, '\0', 16);
vHeader.cbFix = sizeof(BITMAPINFOHEADER2); vHeader.cbFix = 16;
vHeader.cx = nW; vHeader.cx = nW;
vHeader.cy = nH; vHeader.cy = nH;
vHeader.cPlanes = 1; vHeader.cPlanes = 1;
@@ -518,6 +508,7 @@ bool wxBitmap::CreateFromImage (
wxCHECK_MSG(rImage.Ok(), FALSE, wxT("invalid image")); wxCHECK_MSG(rImage.Ok(), FALSE, wxT("invalid image"));
m_refData = new wxBitmapRefData(); m_refData = new wxBitmapRefData();
int nSizeLimit = 1024 * 768 * 3; int nSizeLimit = 1024 * 768 * 3;
int nWidth = rImage.GetWidth(); int nWidth = rImage.GetWidth();
int nBmpHeight = rImage.GetHeight(); int nBmpHeight = rImage.GetHeight();
@@ -556,7 +547,7 @@ bool wxBitmap::CreateFromImage (
SetWidth(nWidth); SetWidth(nWidth);
SetHeight(nBmpHeight); SetHeight(nBmpHeight);
if (nDepth == -1) if (nDepth == -1)
nDepth = wxDisplayDepth(); nDepth = 16; // wxDisplayDepth();
SetDepth(nDepth); SetDepth(nDepth);
#if wxUSE_PALETTE #if wxUSE_PALETTE
@@ -570,41 +561,30 @@ bool wxBitmap::CreateFromImage (
// Create a DIB header // Create a DIB header
// //
BITMAPINFOHEADER2 vHeader; BITMAPINFOHEADER2 vHeader;
BITMAPINFO2 vInfo;
// //
// Fill in the DIB header // Fill in the DIB header
// //
memset(&vHeader, '\0', sizeof(BITMAPINFOHEADER2)); memset(&vHeader, '\0', 16);
vHeader.cbFix = sizeof(vHeader); vHeader.cbFix = 16;
vHeader.cx = (USHORT)nWidth; vHeader.cx = (ULONG)nWidth;
vHeader.cy = (USHORT)nHeight; vHeader.cy = (ULONG)nHeight;
vHeader.cPlanes = 1L; vHeader.cPlanes = 1L;
vHeader.cBitCount = 24; vHeader.cBitCount = 24;
vHeader.ulCompression = BCA_UNCOMP;
vHeader.cbImage = nBytePerLine * nHeight;
vHeader.cclrUsed = 0;
//
// These seem not really needed for our purpose here.
//
vHeader.cxResolution = 0;
vHeader.cyResolution = 0;
vHeader.cclrImportant = 0;
vHeader.usUnits = BRU_METRIC;
vHeader.usReserved = 0;
vHeader.cSize1 = 0;
vHeader.cSize2 = 0;
vHeader.usRecording = BRA_BOTTOMUP;
vHeader.usRendering = BRH_NOTHALFTONED;
vHeader.ulColorEncoding = BCE_RGB;
vHeader.ulIdentifier = 0;
memset(&vInfo, '\0', 16);
vInfo.cbFix = 16;
vInfo.cx = (ULONG)nWidth;
vInfo.cy = (ULONG)nHeight;
vInfo.cPlanes = 1L;
vInfo.cBitCount = 24;
// //
// Memory for DIB data // Memory for DIB data
// //
unsigned char* pucBits; unsigned char* pucBits;
pucBits = (unsigned char *)malloc(vHeader.cbImage); pucBits = (unsigned char *)malloc(nBytePerLine * nHeight);
if(!pucBits) if(!pucBits)
{ {
wxFAIL_MSG(wxT("could not allocate memory for DIB")); wxFAIL_MSG(wxT("could not allocate memory for DIB"));
@@ -618,6 +598,9 @@ bool wxBitmap::CreateFromImage (
SIZEL vSize = {0, 0}; SIZEL vSize = {0, 0};
HDC hDC = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE); HDC hDC = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE);
HPS hPS = ::GpiCreatePS(vHabmain, hDC, &vSize, PU_PELS | GPIA_ASSOC); HPS hPS = ::GpiCreatePS(vHabmain, hDC, &vSize, PU_PELS | GPIA_ASSOC);
LONG lScans;
HDC hDCScreen = ::WinOpenWindowDC(HWND_DESKTOP);
HPS hPSScreen;
HBITMAP hBmp; HBITMAP hBmp;
HBITMAP hBmpOld; HBITMAP hBmpOld;
@@ -675,19 +658,34 @@ bool wxBitmap::CreateFromImage (
// //
// Have to do something similar to WIN32's StretchDIBits, use GpiBitBlt // Have to do something similar to WIN32's StretchDIBits, use GpiBitBlt
// in combination with setting the bits into the selected bitmap
// //
lScans = ::GpiSetBitmapBits( hPS
,0 // Start at the bottom
,(LONG)nHeight // One line per scan
,(PBYTE)pucBits
,&vInfo
);
hPSScreen = ::GpiCreatePS( vHabmain
,hDCScreen
,&vSize
,PU_PELS | GPIA_ASSOC
);
POINTL vPoint[4] = { 0, nOrigin, POINTL vPoint[4] = { 0, nOrigin,
nWidth, nHeight, nWidth, nHeight,
0, 0, nWidth, nHeight 0, 0, nWidth, nHeight
}; };
::GpiBitBlt( hPS
::GpiBitBlt( hPSScreen
,hPS ,hPS
,4 ,4
,vPoint ,vPoint
,ROP_SRCCOPY ,ROP_SRCCOPY
,BBO_IGNORE ,BBO_IGNORE
); );
::GpiDestroyPS(hPSScreen);
nOrigin += nHeight; nOrigin += nHeight;
} }
SetHBITMAP((WXHBITMAP)hBmp); SetHBITMAP((WXHBITMAP)hBmp);
@@ -701,7 +699,15 @@ bool wxBitmap::CreateFromImage (
// //
if (rImage.HasMask()) if (rImage.HasMask())
{ {
hBmp = ::GpiCreateBitmap( hPS
,&vHeader
,0L
,NULL
,NULL
);
memset(&vHeader, '\0', sizeof(BITMAPINFOHEADER2)); memset(&vHeader, '\0', sizeof(BITMAPINFOHEADER2));
hBmpOld = ::GpiSetBitmap(hPS, hBmp);
vHeader.cbFix = sizeof(BITMAPINFOHEADER2); vHeader.cbFix = sizeof(BITMAPINFOHEADER2);
vHeader.cx = nWidth; vHeader.cx = nWidth;
vHeader.cy = nHeight; vHeader.cy = nHeight;
@@ -713,7 +719,6 @@ bool wxBitmap::CreateFromImage (
,NULL ,NULL
,NULL ,NULL
); );
hBmpOld = ::GpiSetBitmap(hPS, hBmp);
if (nNumDIB == 1) if (nNumDIB == 1)
nHeight = nBmpHeight; nHeight = nBmpHeight;
else else
@@ -762,18 +767,29 @@ bool wxBitmap::CreateFromImage (
for (i = 0; i < nPadding; i++) for (i = 0; i < nPadding; i++)
*(ptbits++) = cZero; *(ptbits++) = cZero;
} }
POINTL vPoint[4] = { 0, nOrigin, lScans = ::GpiSetBitmapBits( hPS
nWidth, nHeight, ,0 // Start at the bottom
0, 0, nWidth, nHeight ,(LONG)nHeight // One line per scan
}; ,(PBYTE)pucBits
,&vInfo
::GpiBitBlt( hPS );
hPSScreen = ::GpiCreatePS( vHabmain
,hDCScreen
,&vSize
,PU_PELS | GPIA_ASSOC
);
POINTL vPoint2[4] = { 0, nOrigin,
nWidth, nHeight,
0, 0, nWidth, nHeight
};
::GpiBitBlt( hPSScreen
,hPS ,hPS
,4 ,4
,vPoint ,vPoint2
,ROP_SRCCOPY ,ROP_SRCCOPY
,BBO_IGNORE ,BBO_IGNORE
); );
::GpiDestroyPS(hPSScreen);
nOrigin += nHeight; nOrigin += nHeight;
} }
@@ -846,26 +862,21 @@ wxImage wxBitmap::ConvertToImage() const
// //
// Create and fill a DIB header // Create and fill a DIB header
// //
memset(&vDIBh, '\0', sizeof(BITMAPINFOHEADER2)); memset(&vDIBh, '\0', 16);
vDIBh.cbFix = sizeof(BITMAPINFOHEADER2); vDIBh.cbFix = 16;
vDIBh.cx = nWidth; vDIBh.cx = nWidth;
vDIBh.cy = nHeight; vDIBh.cy = nHeight;
vDIBh.cPlanes = 1; vDIBh.cPlanes = 1;
vDIBh.cbImage = nBytePerLine * nHeight;
vDIBh.cBitCount = 24; vDIBh.cBitCount = 24;
memset(&vDIBInfo, '\0', sizeof(BITMAPINFO2)); memset(&vDIBInfo, '\0', 16);
vDIBInfo.cbFix = sizeof(BITMAPINFO2); vDIBInfo.cbFix = 16;
vDIBInfo.cx = nWidth;
vDIBInfo.cy = nHeight;
vDIBInfo.cPlanes = 1; vDIBInfo.cPlanes = 1;
vDIBInfo.cBitCount = 24; vDIBInfo.cBitCount = 24;
vDIBInfo.ulCompression = BCA_UNCOMP;
vDIBInfo.usReserved = 0;
vDIBInfo.usRecording = BRA_BOTTOMUP;
vDIBInfo.usRendering = BRH_NOTHALFTONED;
vDIBInfo.ulColorEncoding = BCE_RGB;
vDIBInfo.ulIdentifier = 0;
lpBits = (unsigned char *)malloc(vDIBh.cbImage); lpBits = (unsigned char *)malloc(nBytePerLine * nHeight);
if (!lpBits) if (!lpBits)
{ {
wxFAIL_MSG(wxT("could not allocate data for DIB")); wxFAIL_MSG(wxT("could not allocate data for DIB"));
@@ -1029,9 +1040,9 @@ wxBitmap wxBitmap::GetSubBitmap(
HDC hDCDst = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE); HDC hDCDst = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE);
HPS hPSSrc = ::GpiCreatePS(vHabmain, hDCSrc, &vSize, PU_PELS | GPIA_ASSOC); HPS hPSSrc = ::GpiCreatePS(vHabmain, hDCSrc, &vSize, PU_PELS | GPIA_ASSOC);
HPS hPSDst = ::GpiCreatePS(vHabmain, hDCDst, &vSize, PU_PELS | GPIA_ASSOC); HPS hPSDst = ::GpiCreatePS(vHabmain, hDCDst, &vSize, PU_PELS | GPIA_ASSOC);
POINTL vPoint[4] = { rRect.x, rRect.y, POINTL vPoint[4] = { 0, 0, rRect.width, rRect.height,
rRect.x + rRect.width, rRect.y + rRect.height, rRect.x, rRect.y
0, 0, GetWidth(), GetHeight() rRect.x + rRect.width, rRect.y + rRect.height
}; };
::GpiSetBitmap(hPSSrc, (HBITMAP) GetHBITMAP()); ::GpiSetBitmap(hPSSrc, (HBITMAP) GetHBITMAP());

50
src/os2/dc.cpp
View File

@@ -1200,16 +1200,48 @@ void wxDC::DoDrawBitmap(
, bool bUseMask , bool bUseMask
) )
{ {
POINTL vPoint = {vX, vY}; if (!bUseMask && !IsKindOf(CLASSINFO(wxPrinterDC)))
{
HBITMAP hBitmap = (HBITMAP)rBmp.GetHBITMAP();
wxBitmap vNewBitmap( rBmp.GetWidth()
,rBmp.GetHeight()
,rBmp.GetDepth()
);
HBITMAP hBitmapOld = ::GpiSetBitmap((HPS)GetHPS(), vNewBitmap.GetHBITMAP());
LONG lOldTextground = ::GpiQueryColor((HPS)GetHPS());
LONG lOldBackground = ::GpiQueryBackColor((HPS)GetHPS());
::WinDrawBitmap( GetHPS() if (m_textForegroundColour.Ok())
,(HBITMAP)GetHbitmapOf(rBmp) {
,NULL ::GpiSetColor( (HPS)GetHPS()
,&vPoint ,m_textForegroundColour.GetPixel()
,0L );
,0L }
,DBM_NORMAL if (m_textBackgroundColour.Ok())
); {
::GpiSetBackColor( (HPS)GetHPS()
,m_textBackgroundColour.GetPixel()
);
}
vY = OS2Y(vY,rBmp.GetHeight());
POINTL vPoint[4] = { vX, vY + rBmp.GetHeight()
,vX + rBmp.GetWidth(), vY
,0, 0
,rBmp.GetWidth(), rBmp.GetHeight()
};
::GpiWCBitBlt( (HPS)GetHPS()
,hBitmap
,4
,vPoint
,ROP_SRCCOPY
,BBO_IGNORE
);
::GpiSetBitmap((HPS)GetHPS(), hBitmapOld);
::GpiSetColor((HPS)GetHPS(), lOldTextground);
::GpiSetBackColor((HPS)GetHPS(), lOldBackground);
}
} // end of wxDC::DoDrawBitmap } // end of wxDC::DoDrawBitmap
void wxDC::DoDrawText( void wxDC::DoDrawText(

12
src/os2/dcclient.cpp
View File

@@ -160,6 +160,18 @@ void wxWindowDC::InitDC()
vColor.Set("WHITE"); vColor.Set("WHITE");
m_brush.SetColour(vColor); m_brush.SetColour(vColor);
InitializePalette(); InitializePalette();
wxFont* pFont = new wxFont( 12
,wxNORMAL
,wxNORMAL
,wxBOLD
);
SetFont(*pFont);
delete pFont;
//
// OS/2 default vertical character allignment needs to match the other OS's
//
::GpiSetTextAlignment((HPS)GetHPS(), TA_NORMAL_HORIZ, TA_BOTTOM);
} // end of wxWindowDC::InitDC } // end of wxWindowDC::InitDC
void wxWindowDC::DoGetSize( void wxWindowDC::DoGetSize(