X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/906c935a80b10d53cecf57f71ab5f3f4f1d529ec..4a2d030adfa836f6ada1830c9057170d053bcc64:/src/msw/bitmap.cpp diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp index 10756fee7c..61ad4d25f8 100644 --- a/src/msw/bitmap.cpp +++ b/src/msw/bitmap.cpp @@ -4,7 +4,6 @@ // Author: Julian Smart // Modified by: // Created: 04/01/98 -// RCS-ID: $Id$ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -39,6 +38,7 @@ #include "wx/image.h" #endif +#include "wx/scopedptr.h" #include "wx/msw/private.h" #include "wx/msw/dc.h" @@ -62,12 +62,14 @@ class WXDLLEXPORT wxBitmapRefData : public wxGDIImageRefData { public: - wxBitmapRefData(); + wxBitmapRefData() { Init(); } wxBitmapRefData(const wxBitmapRefData& data); virtual ~wxBitmapRefData() { Free(); } virtual void Free(); + void CopyFromDIB(const wxDIB& dib); + // set the mask object to use as the mask, we take ownership of it void SetMask(wxMask *mask) { @@ -114,6 +116,8 @@ public: bool m_isDIB; private: + void Init(); + // optional mask for transparent drawing wxMask *m_bitmapMask; @@ -183,7 +187,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject) // wxBitmapRefData // ---------------------------------------------------------------------------- -wxBitmapRefData::wxBitmapRefData() +void wxBitmapRefData::Init() { #if wxDEBUG_LEVEL m_selectedInto = NULL; @@ -202,23 +206,25 @@ wxBitmapRefData::wxBitmapRefData() wxBitmapRefData::wxBitmapRefData(const wxBitmapRefData& data) : wxGDIImageRefData(data) { -#if wxDEBUG_LEVEL - m_selectedInto = NULL; -#endif + Init(); // (deep) copy the mask if present - m_bitmapMask = NULL; if (data.m_bitmapMask) m_bitmapMask = new wxMask(*data.m_bitmapMask); - // FIXME: we don't copy m_hBitmap currently but we should, see wxBitmap:: - // CloneGDIRefData() - - wxASSERT_MSG( !data.m_isDIB, + wxASSERT_MSG( !data.m_dib, wxT("can't copy bitmap locked for raw access!") ); - m_isDIB = false; m_hasAlpha = data.m_hasAlpha; + +#if wxUSE_WXDIB + // copy the other bitmap + if ( data.m_hBitmap ) + { + wxDIB dib((HBITMAP)(data.m_hBitmap)); + CopyFromDIB(dib); + } +#endif // wxUSE_WXDIB } void wxBitmapRefData::Free() @@ -241,6 +247,35 @@ void wxBitmapRefData::Free() wxDELETE(m_bitmapMask); } +void wxBitmapRefData::CopyFromDIB(const wxDIB& dib) +{ + wxCHECK_RET( !IsOk(), "bitmap already initialized" ); + wxCHECK_RET( dib.IsOk(), wxT("invalid DIB in CopyFromDIB") ); + +#ifdef SOMETIMES_USE_DIB + HBITMAP hbitmap = dib.CreateDDB(); + if ( !hbitmap ) + return; + m_isDIB = false; +#else // ALWAYS_USE_DIB + HBITMAP hbitmap = const_cast(dib).Detach(); + m_isDIB = true; +#endif // SOMETIMES_USE_DIB/ALWAYS_USE_DIB + + m_width = dib.GetWidth(); + m_height = dib.GetHeight(); + m_depth = dib.GetDepth(); + + m_hBitmap = (WXHBITMAP)hbitmap; + +#if wxUSE_PALETTE + wxPalette *palette = dib.CreatePalette(); + if ( palette ) + m_bitmapPalette = *palette; + delete palette; +#endif // wxUSE_PALETTE +} + // ---------------------------------------------------------------------------- // wxBitmap creation // ---------------------------------------------------------------------------- @@ -250,46 +285,9 @@ wxGDIImageRefData *wxBitmap::CreateData() const return new wxBitmapRefData; } -wxGDIRefData *wxBitmap::CloneGDIRefData(const wxGDIRefData *dataOrig) const +wxGDIRefData *wxBitmap::CloneGDIRefData(const wxGDIRefData *data) const { - const wxBitmapRefData * - data = static_cast(dataOrig); - if ( !data ) - return NULL; - - // FIXME: this method is backwards, it should just create a new - // wxBitmapRefData using its copy ctor but instead it modifies this - // bitmap itself and then returns its m_refData -- which works, of - // course (except in !wxUSE_WXDIB), but is completely illogical - wxBitmap *self = const_cast(this); - - wxBitmapRefData *selfdata; -#if wxUSE_WXDIB - // copy the other bitmap - if ( data->m_hBitmap ) - { - wxDIB dib((HBITMAP)(data->m_hBitmap)); - self->CopyFromDIB(dib); - - selfdata = static_cast(m_refData); - selfdata->m_hasAlpha = data->m_hasAlpha; - } - else -#endif // wxUSE_WXDIB - { - // copy the bitmap data - selfdata = new wxBitmapRefData(*data); - self->m_refData = selfdata; - } - - // copy also the mask - wxMask * const maskSrc = data->GetMask(); - if ( maskSrc ) - { - selfdata->SetMask(new wxMask(*maskSrc)); - } - - return selfdata; + return new wxBitmapRefData(*static_cast(data)); } bool wxBitmap::CopyFromIconOrCursor(const wxGDIImage& icon, @@ -342,8 +340,9 @@ bool wxBitmap::CopyFromIconOrCursor(const wxGDIImage& icon, wxDIB dib(iconInfo.hbmColor); if (dib.IsOk()) { - const unsigned char* pixels = dib.GetData(); - for (int idx = 0; idx < w*h*4; idx+=4) + unsigned char* const pixels = dib.GetData(); + int idx; + for ( idx = 0; idx < w*h*4; idx += 4 ) { if (pixels[idx+3] != 0) { @@ -353,6 +352,25 @@ bool wxBitmap::CopyFromIconOrCursor(const wxGDIImage& icon, break; } } + + if ( refData->m_hasAlpha ) + { + // If we do have alpha, ensure we use premultiplied + // data for our pixels as this is what the bitmaps + // created in other ways do and this is necessary + // for e.g. AlphaBlend() to work with this bitmap. + for ( idx = 0; idx < w*h*4; idx += 4 ) + { + const unsigned char a = pixels[idx+3]; + + pixels[idx] = ((pixels[idx] *a) + 127)/255; + pixels[idx+1] = ((pixels[idx+1]*a) + 127)/255; + pixels[idx+2] = ((pixels[idx+2]*a) + 127)/255; + } + + ::DeleteObject(refData->m_hBitmap); + refData->m_hBitmap = dib.Detach(); + } } } } @@ -407,37 +425,13 @@ bool wxBitmap::CopyFromIcon(const wxIcon& icon, wxBitmapTransparency transp) bool wxBitmap::CopyFromDIB(const wxDIB& dib) { - wxCHECK_MSG( dib.IsOk(), false, wxT("invalid DIB in CopyFromDIB") ); - -#ifdef SOMETIMES_USE_DIB - HBITMAP hbitmap = dib.CreateDDB(); - if ( !hbitmap ) + wxScopedPtr newData(new wxBitmapRefData); + newData->CopyFromDIB(dib); + if ( !newData->IsOk() ) return false; -#else // ALWAYS_USE_DIB - HBITMAP hbitmap = const_cast(dib).Detach(); -#endif // SOMETIMES_USE_DIB/ALWAYS_USE_DIB UnRef(); - - wxBitmapRefData *refData = new wxBitmapRefData; - m_refData = refData; - - refData->m_width = dib.GetWidth(); - refData->m_height = dib.GetHeight(); - refData->m_depth = dib.GetDepth(); - - refData->m_hBitmap = (WXHBITMAP)hbitmap; - -#if wxUSE_PALETTE - wxPalette *palette = dib.CreatePalette(); - if ( palette ) - { - refData->m_bitmapPalette = *palette; - } - - delete palette; -#endif // wxUSE_PALETTE - + m_refData = newData.release(); return true; } @@ -1178,15 +1172,6 @@ wxMask *wxBitmap::GetMask() const return GetBitmapData() ? GetBitmapData()->GetMask() : NULL; } -wxBitmap wxBitmap::GetMaskBitmap() const -{ - wxBitmap bmp; - wxMask *mask = GetMask(); - if ( mask ) - bmp.SetHBITMAP(mask->GetMaskBitmap()); - return bmp; -} - wxDC *wxBitmap::GetSelectedInto() const { #if wxDEBUG_LEVEL @@ -1554,6 +1539,13 @@ bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour) #endif // __WXMICROWIN__/!__WXMICROWIN__ } +wxBitmap wxMask::GetBitmap() const +{ + wxBitmap bmp; + bmp.SetHBITMAP(m_maskBitmap); + return bmp; +} + // ---------------------------------------------------------------------------- // wxBitmapHandler // ----------------------------------------------------------------------------