X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f16e72c8371e1dd64eb44b65148dcf6b9cfcb8e1..1978421a6d8b81c1f8a961da4b8ddf544fec7b1b:/src/os2/bitmap.cpp diff --git a/src/os2/bitmap.cpp b/src/os2/bitmap.cpp index 6a6be7033f..b2d7e5ffb1 100644 --- a/src/os2/bitmap.cpp +++ b/src/os2/bitmap.cpp @@ -58,7 +58,7 @@ wxBitmapRefData::wxBitmapRefData() m_pSelectedInto = NULL; m_nNumColors = 0; m_pBitmapMask = NULL; - m_hBitmap = (WXHBITMAP) NULL; + m_hBitmap = (WXHBITMAP) NULL; } // end of wxBitmapRefData::wxBitmapRefData void wxBitmapRefData::Free() @@ -74,9 +74,11 @@ void wxBitmapRefData::Free() wxLogLastError("GpiDeleteBitmap(hbitmap)"); } } - - delete m_pBitmapMask; - m_pBitmapMask = NULL; + if (m_pBitmapMask) + { + delete m_pBitmapMask; + m_pBitmapMask = NULL; + } } // end of wxBitmapRefData::Free // ---------------------------------------------------------------------------- @@ -86,6 +88,10 @@ void wxBitmapRefData::Free() // this function should be called from all wxBitmap ctors void wxBitmap::Init() { + m_bIsMono = FALSE; + // + // True for all bitmaps created from bits, wxImages, Xpms + // } // end of wxBitmap::Init bool wxBitmap::CopyFromIconOrCursor( @@ -113,9 +119,11 @@ bool wxBitmap::CopyFromIconOrCursor( pRefData->m_hBitmap = (WXHBITMAP)SIconInfo.hbmColor; - // - // No mask in the Info struct in OS/2 - // + wxMask* pMask = new wxMask(SIconInfo.hbmPointer); + + pMask->SetMaskBitmap(GetHBITMAP()); + SetMask(pMask); + return(TRUE); } // end of wxBitmap::CopyFromIconOrCursor @@ -227,6 +235,8 @@ wxBitmap::wxBitmap( pzData = (char *)zBits; // const_cast is harmless } + if (nDepth > 24) + nDepth = 24; // MAX supported in PM memset(&vHeader, '\0', 16); vHeader.cbFix = 16; vHeader.cx = (USHORT)nWidth; @@ -260,7 +270,6 @@ wxBitmap::wxBitmap( ) { Init(); - (void)Create( nW ,nH ,nD @@ -286,15 +295,15 @@ wxBitmap::wxBitmap( } // end of wxBitmap::wxBitmap wxBitmap::wxBitmap( - const wxString& rFilename + int nId , long lType ) { Init(); - - LoadFile( rFilename + LoadFile( nId ,(int)lType ); + SetId(nId); } // end of wxBitmap::wxBitmap bool wxBitmap::Create( @@ -313,6 +322,10 @@ bool wxBitmap::Create( GetBitmapData()->m_nHeight = nH; GetBitmapData()->m_nDepth = nD; + // + // Xpms and bitmaps from other images can also be mono's, but only + // mono's need help changing their colors with MemDC changes + // if (nD > 0) { DEVOPENSTRUC vDop = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L}; @@ -320,12 +333,14 @@ bool wxBitmap::Create( HDC hDC = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE); HPS hPS = ::GpiCreatePS(vHabmain, hDC, &vSize, PU_PELS | GPIA_ASSOC); + if (nD == 1) + m_bIsMono = TRUE; memset(&vHeader, '\0', 16); vHeader.cbFix = 16; vHeader.cx = nW; vHeader.cy = nH; vHeader.cPlanes = 1; - vHeader.cBitCount = nD; + vHeader.cBitCount = 24; //nD; hBmp = ::GpiCreateBitmap( hPS ,&vHeader @@ -346,6 +361,9 @@ bool wxBitmap::Create( hDCScreen = ::GpiQueryDevice(hPSScreen); ::DevQueryCaps(hDCScreen, CAPS_COLOR_BITCOUNT, 1L, &lBitCount); + if (lBitCount > 24) + lBitCount = 24; + memset(&vHeader, '\0', 16); vHeader.cbFix = 16; vHeader.cx = nW; @@ -365,10 +383,6 @@ bool wxBitmap::Create( } SetHBITMAP((WXHBITMAP)hBmp); -#if WXWIN_COMPATIBILITY_2 - GetBitmapData()->m_bOk = hBmp != 0; -#endif // WXWIN_COMPATIBILITY_2 - return Ok(); } // end of wxBitmap::Create @@ -394,7 +408,7 @@ bool wxBitmap::CreateFromXpm( } // end of wxBitmap::CreateFromXpm bool wxBitmap::LoadFile( - const wxString& rFilename + int nId , long lType ) { @@ -411,8 +425,7 @@ bool wxBitmap::LoadFile( m_refData = new wxBitmapRefData; return(pHandler->LoadFile( this - ,rFilename - ,hPs + ,nId ,lType , -1 , -1 @@ -420,14 +433,7 @@ bool wxBitmap::LoadFile( } else { - wxImage vImage; - - if (!vImage.LoadFile(rFilename, lType) || !vImage.Ok() ) - return(FALSE); - - *this = wxBitmap(vImage); - - return(TRUE); + return(FALSE); } } // end of wxBitmap::LoadFile @@ -498,7 +504,7 @@ bool wxBitmap::SaveFile( // ---------------------------------------------------------------------------- -// wxImage-wxBitmap convertion +// wxImage-wxBitmap conversion // ---------------------------------------------------------------------------- bool wxBitmap::CreateFromImage ( @@ -509,7 +515,6 @@ bool wxBitmap::CreateFromImage ( wxCHECK_MSG(rImage.Ok(), FALSE, wxT("invalid image")); m_refData = new wxBitmapRefData(); - int nSizeLimit = 1024 * 768 * 3; int nWidth = rImage.GetWidth(); int nBmpHeight = rImage.GetHeight(); @@ -547,8 +552,12 @@ bool wxBitmap::CreateFromImage ( wxCHECK_MSG(rImage.Ok(), FALSE, wxT("invalid image")); SetWidth(nWidth); SetHeight(nBmpHeight); + if (nDepth == 1) + m_bIsMono = TRUE; + else + m_bIsMono = FALSE; if (nDepth == -1) - nDepth = 16; // wxDisplayDepth(); + nDepth = wxDisplayDepth(); SetDepth(nDepth); #if wxUSE_PALETTE @@ -574,12 +583,6 @@ bool wxBitmap::CreateFromImage ( vHeader.cPlanes = 1L; vHeader.cBitCount = 24; - 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 // @@ -591,6 +594,7 @@ bool wxBitmap::CreateFromImage ( wxFAIL_MSG(wxT("could not allocate memory for DIB")); return FALSE; } + memset(pucBits, '\0', (nBytePerLine * nHeight)); // // Create and set the device-dependent bitmap @@ -600,18 +604,24 @@ bool wxBitmap::CreateFromImage ( HDC hDC = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE); HPS hPS = ::GpiCreatePS(vHabmain, hDC, &vSize, PU_PELS | GPIA_ASSOC); LONG lScans; - HDC hDCScreen = ::WinOpenWindowDC(HWND_DESKTOP); + HDC hDCScreen = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE); HPS hPSScreen; HBITMAP hBmp; HBITMAP hBmpOld; + memset(&vInfo, '\0', 16); + vInfo.cbFix = 16; + vInfo.cx = (ULONG)nWidth; + vInfo.cy = (ULONG)nHeight; + vInfo.cPlanes = 1; + vInfo.cBitCount = 24; // Set to desired count going in + hBmp = ::GpiCreateBitmap( hPS ,&vHeader ,0L ,NULL ,NULL ); - hBmpOld = ::GpiSetBitmap(hPS, hBmp); #if wxUSE_PALETTE HPAL hOldPalette = NULLHANDLE; if (rImage.GetPalette().Ok()) @@ -631,6 +641,14 @@ bool wxBitmap::CreateFromImage ( unsigned char* ptdata = pData; unsigned char* ptbits; + if ((hBmpOld = ::GpiSetBitmap(hPS, hBmp)) == HBM_ERROR) + { + ERRORID vError; + wxString sError; + + vError = ::WinGetLastError(vHabmain); + sError = wxPMErrorToStr(vError); + } for (n = 0; n < nNumDIB; n++) { if (nNumDIB > 1 && n == nNumDIB - 1 && nHRemain > 0) @@ -674,7 +692,6 @@ bool wxBitmap::CreateFromImage ( vError = ::WinGetLastError(vHabmain); sError = wxPMErrorToStr(vError); } - hPSScreen = ::GpiCreatePS( vHabmain ,hDCScreen ,&vSize @@ -708,11 +725,11 @@ bool wxBitmap::CreateFromImage ( // if (rImage.HasMask()) { - vHeader.cbFix = sizeof(BITMAPINFOHEADER2); + vHeader.cbFix = 16; vHeader.cx = nWidth; vHeader.cy = nHeight; vHeader.cPlanes = 1; - vHeader.cBitCount = 1; + vHeader.cBitCount = 24; hBmp = ::GpiCreateBitmap( hPS ,&vHeader ,0L @@ -725,7 +742,6 @@ bool wxBitmap::CreateFromImage ( else nHeight = nSizeLimit / nBytePerLine; vHeader.cy = (DWORD)(nHeight); - vHeader.cbImage = nBytePerLine * nHeight; nOrigin = 0; unsigned char cRed = rImage.GetMaskRed(); @@ -752,7 +768,11 @@ bool wxBitmap::CreateFromImage ( { for (i = 0; i < nWidth; i++) { - if ((*(ptdata++) != cRed) || (*(ptdata++) != cGreen) || (*(ptdata++) != cBlue)) + unsigned char cRedImage = (*(ptdata++)) ; + unsigned char cGreenImage = (*(ptdata++)) ; + unsigned char cBlueImage = (*(ptdata++)) ; + + if ((cRedImage != cRed) || (cGreenImage != cGreen) || (cBlueImage != cBlue)) { *(ptbits++) = cOne; *(ptbits++) = cOne; @@ -801,7 +821,7 @@ bool wxBitmap::CreateFromImage ( pMask->SetMaskBitmap((WXHBITMAP)hBmp); SetMask(pMask); - hBmpOld = ::GpiSetBitmap(hPS, hBmp); + hBmpOld = ::GpiSetBitmap(hPS, hBmpOld); } // @@ -809,6 +829,7 @@ bool wxBitmap::CreateFromImage ( // ::GpiSetBitmap(hPS, NULLHANDLE); ::GpiDestroyPS(hPS); + ::DevCloseDC(hDCScreen); ::DevCloseDC(hDC); free(pucBits); return TRUE; @@ -817,6 +838,7 @@ bool wxBitmap::CreateFromImage ( wxImage wxBitmap::ConvertToImage() const { wxImage vImage; + wxDC* pDC; wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") ); @@ -836,12 +858,13 @@ wxImage wxBitmap::ConvertToImage() const long lScans; BITMAPINFOHEADER2 vDIBh; BITMAPINFO2 vDIBInfo; - HDC hDCMem; - PSZ pszData[4] = { "Display", NULL, NULL, NULL }; HPS hPSMem; HPS hPS; - SIZEL vSizlPage = {0,0}; HBITMAP hBitmap; + HBITMAP hOldBitmap; + DEVOPENSTRUC vDop = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L}; + SIZEL vSizlPage = {0,0}; + HDC hDCMem; vImage.Create( nWidth ,nHeight @@ -884,35 +907,56 @@ wxImage wxBitmap::ConvertToImage() const free(pData); return wxNullImage; } + memset(lpBits, '\0', (nBytePerLine * nHeight)); + hBitmap = (HBITMAP)GetHBITMAP(); + + // + // May already be selected into a PS + // + if ((pDC = GetSelectedInto()) != NULL) + { + hPSMem = pDC->GetHPS(); + } + else + { + hDCMem = ::DevOpenDC( vHabmain + ,OD_MEMORY + ,"*" + ,5L + ,(PDEVOPENDATA)&vDop + ,NULLHANDLE + ); + hPSMem = ::GpiCreatePS( vHabmain + ,hDCMem + ,&vSizlPage + ,PU_PELS | GPIA_ASSOC + ); + } + if ((hOldBitmap = ::GpiSetBitmap(hPSMem, hBitmap)) == HBM_ERROR) + { + ERRORID vError; + wxString sError; + + vError = ::WinGetLastError(vHabmain); + sError = wxPMErrorToStr(vError); + } // // Copy data from the device-dependent bitmap to the DIB // - hDCMem = ::DevOpenDC( vHabmain - ,OD_MEMORY - ,"*" - ,4 - ,(PDEVOPENDATA)pszData - ,NULLHANDLE - ); - hPSMem = ::GpiCreatePS( vHabmain - ,hDCMem - ,&vSizlPage - ,PU_PELS | GPIA_ASSOC | GPIT_MICRO - ); - hBitmap = ::GpiCreateBitmap( hPSMem - ,&vDIBh - ,0L - ,NULL - ,NULL - ); - ::GpiSetBitmap(hPSMem, hBitmap); - lScans = ::GpiQueryBitmapBits( hPSMem - ,0L - ,(LONG)nHeight - ,(PBYTE)lpBits - ,&vDIBInfo - ); + if ((lScans = ::GpiQueryBitmapBits( hPSMem + ,0L + ,(LONG)nHeight + ,(PBYTE)lpBits + ,&vDIBInfo + )) == GPI_ALTERROR) + { + ERRORID vError; + wxString sError; + + vError = ::WinGetLastError(vHabmain); + sError = wxPMErrorToStr(vError); + } // // Copy DIB data into the wxImage object @@ -933,7 +977,12 @@ wxImage wxBitmap::ConvertToImage() const } ptbits += nPadding; } - ::GpiSetBitmap(hPSMem, NULLHANDLE); + if ((pDC = GetSelectedInto()) == NULL) + { + ::GpiSetBitmap(hPSMem, NULLHANDLE); + ::GpiDestroyPS(hPSMem); + ::DevCloseDC(hDCMem); + } // // Similarly, set data according to the possible mask bitmap @@ -945,17 +994,17 @@ wxImage wxBitmap::ConvertToImage() const // // Memory DC/PS created, color set, data copied, and memory DC/PS deleted // - HDC hMemDC = ::DevOpenDC( vHabmain - ,OD_MEMORY - ,"*" - ,4 - ,(PDEVOPENDATA)pszData - ,NULLHANDLE - ); + HDC hMemDC = ::DevOpenDC( vHabmain + ,OD_MEMORY + ,"*" + ,5L + ,(PDEVOPENDATA)&vDop + ,NULLHANDLE + ); HPS hMemPS = ::GpiCreatePS( vHabmain ,hMemDC ,&vSizlPage - ,PU_PELS | GPIA_ASSOC | GPIT_MICRO + ,PU_PELS | GPIA_ASSOC ); ::GpiSetColor(hMemPS, OS2RGB(0, 0, 0)); ::GpiSetBackColor(hMemPS, OS2RGB(255, 255, 255) ); @@ -1009,8 +1058,6 @@ wxImage wxBitmap::ConvertToImage() const // // Free allocated resources // - ::GpiDestroyPS(hPSMem); - ::DevCloseDC(hDCMem); free(lpBits); return vImage; } // end of wxBitmap::ConvertToImage @@ -1072,7 +1119,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 @@ -1120,17 +1167,6 @@ void wxBitmap::SetQuality( GetBitmapData()->m_nQuality = nQ; } // end of wxBitmap::SetQuality -#if WXWIN_COMPATIBILITY_2 -void wxBitmap::SetOk( - bool bOk -) -{ - EnsureHasData(); - - GetBitmapData()->m_bOk = bOk; -} // end of wxBitmap::SetOk -#endif // WXWIN_COMPATIBILITY_2 - void wxBitmap::SetPalette( const wxPalette& rPalette ) @@ -1237,7 +1273,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 @@ -1423,8 +1459,7 @@ bool wxBitmapHandler::Create( bool wxBitmapHandler::Load( wxGDIImage* pImage -, const wxString& rName -, HPS hPs +, int nId , long lFlags , int nWidth , int nHeight @@ -1435,8 +1470,7 @@ bool wxBitmapHandler::Load( ); return(pBitmap ? LoadFile( pBitmap - ,rName - ,hPs + ,nId ,lFlags ,nWidth ,nHeight @@ -1473,8 +1507,7 @@ bool wxBitmapHandler::Create( bool wxBitmapHandler::LoadFile( wxBitmap* WXUNUSED(pBitmap) -, const wxString& WXUNUSED(rName) -, HPS WXUNUSED(hPs) +, int WXUNUSED(nId) , long WXUNUSED(lType) , int WXUNUSED(nDesiredWidth) , int WXUNUSED(nDesiredHeight) @@ -1531,12 +1564,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