// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
- #pragma implementation "bitmap.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#include "wx/msw/private.h"
#include "wx/log.h"
-#if !defined(__WXMICROWIN__)
+#if wxUSE_WXDIB
#include "wx/msw/dib.h"
#endif
#include "wx/image.h"
#include "wx/xpmdecod.h"
+#ifdef wxHAVE_RAW_BITMAP
#include "wx/rawbmp.h"
+#endif
// missing from mingw32 header
#ifndef CLR_INVALID
{
public:
wxBitmapRefData();
+ wxBitmapRefData(const wxBitmapRefData& data);
virtual ~wxBitmapRefData() { Free(); }
virtual void Free();
wxDC *m_selectedInto;
#endif // __WXDEBUG__
+#if wxUSE_WXDIB
// when GetRawData() is called for a DDB we need to convert it to a DIB
// first to be able to provide direct access to it and we cache that DIB
// here and convert it back to DDB when UngetRawData() is called
wxDIB *m_dib;
+#endif
// true if we have alpha transparency info and can be drawn using
// AlphaBlend()
// optional mask for transparent drawing
wxMask *m_bitmapMask;
- DECLARE_NO_COPY_CLASS(wxBitmapRefData)
+
+ // not implemented
+ wxBitmapRefData& operator=(const wxBitmapRefData&);
};
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// decide whether we should create a DIB or a DDB for the given parameters
-static bool wxShouldCreateDIB(int w, int h, int d, WXHDC hdc)
-{
- // here is the logic:
- //
- // (a) if hdc is specified, the caller explicitly wants DDB
- // (b) otherwise, create a DIB if depth >= 24 (we don't support 16bpp or
- // less DIBs anyhow)
- // (c) finally, create DIBs under Win9x even if the depth hasn't been
- // explicitly specified but the current display depth is 24 or more
- // and the image is "big", i.e. > 16Mb which is the theoretical limit
- // for DDBs under Win9x
- //
- // consequences (all of which seem to make sense):
- //
- // (i) by default, DDBs are created (depth == -1 usually)
- // (ii) DIBs can be created by explicitly specifying the depth
- // (iii) using a DC always forces creating a DDB
- return !hdc &&
- (d >= 24 ||
- (d == -1 &&
- wxDIB::GetLineSize(w, wxDisplayDepth())*h > 16*1024*1024));
-}
+//
+// NB: we always use DIBs under Windows CE as this is much simpler (even if
+// also less efficient...) and we obviously can't use them if there is no
+// DIB support compiled in at all
+#ifdef __WXWINCE__
+ static inline bool wxShouldCreateDIB(int, int, int, WXHDC) { return true; }
+
+ #define ALWAYS_USE_DIB
+#elif !wxUSE_WXDIB
+ // no sense in defining wxShouldCreateDIB() as we can't compile code
+ // executed if it is true, so we have to use #if's anyhow
+ #define NEVER_USE_DIB
+#else // wxUSE_WXDIB && !__WXWINCE__
+ static inline bool wxShouldCreateDIB(int w, int h, int d, WXHDC hdc)
+ {
+ // here is the logic:
+ //
+ // (a) if hdc is specified, the caller explicitly wants DDB
+ // (b) otherwise, create a DIB if depth >= 24 (we don't support 16bpp
+ // or less DIBs anyhow)
+ // (c) finally, create DIBs under Win9x even if the depth hasn't been
+ // explicitly specified but the current display depth is 24 or
+ // more and the image is "big", i.e. > 16Mb which is the
+ // theoretical limit for DDBs under Win9x
+ //
+ // consequences (all of which seem to make sense):
+ //
+ // (i) by default, DDBs are created (depth == -1 usually)
+ // (ii) DIBs can be created by explicitly specifying the depth
+ // (iii) using a DC always forces creating a DDB
+ return !hdc &&
+ (d >= 24 ||
+ (d == -1 &&
+ wxDIB::GetLineSize(w, wxDisplayDepth())*h > 16*1024*1024));
+ }
+
+ #define SOMETIMES_USE_DIB
+#endif // different DIB usage scenarious
// ----------------------------------------------------------------------------
// wxBitmapRefData
m_bitmapMask = NULL;
m_hBitmap = (WXHBITMAP) NULL;
+#if wxUSE_WXDIB
m_dib = NULL;
+#endif
m_isDIB =
- m_hasAlpha = FALSE;
+ m_hasAlpha = false;
+}
+
+wxBitmapRefData::wxBitmapRefData(const wxBitmapRefData& data)
+ : wxGDIImageRefData(data)
+{
+#ifdef __WXDEBUG__
+ m_selectedInto = NULL;
+#endif
+
+ // can't copy the mask as the other bitmap destroys it
+ m_bitmapMask = NULL;
+
+ wxASSERT_MSG( !data.m_isDIB,
+ _T("can't copy bitmap locked for raw access!") );
+ m_isDIB = false;
+
+ m_hasAlpha = data.m_hasAlpha;
}
void wxBitmapRefData::Free()
wxASSERT_MSG( !m_selectedInto,
wxT("deleting bitmap still selected into wxMemoryDC") );
+#if wxUSE_WXDIB
wxASSERT_MSG( !m_dib, _T("forgot to call wxBitmap::UngetRawData()!") );
+#endif
if ( m_hBitmap)
{
// wxBitmap creation
// ----------------------------------------------------------------------------
-// this function should be called from all wxBitmap ctors
-void wxBitmap::Init()
+wxGDIImageRefData *wxBitmap::CreateData() const
{
- // m_refData = NULL; done in the base class ctor
+ return new wxBitmapRefData;
}
-wxGDIImageRefData *wxBitmap::CreateData() const
+wxObjectRefData *wxBitmap::CloneRefData(const wxObjectRefData *dataOrig) const
{
- return new wxBitmapRefData;
+ const wxBitmapRefData *
+ data = wx_static_cast(const wxBitmapRefData *, dataOrig);
+ if ( !data )
+ return NULL;
+
+ wxBitmap *self = wx_const_cast(wxBitmap *, this);
+
+#if wxUSE_WXDIB
+ // copy the other bitmap
+ if ( data->m_hBitmap )
+ {
+ wxDIB dib((HBITMAP)(data->m_hBitmap));
+ self->CopyFromDIB(dib);
+ }
+ else
+#endif // wxUSE_WXDIB
+ {
+ // don't copy the bitmap data, but do copy the size, depth, ...
+ self->m_refData = new wxBitmapRefData(*data);
+ }
+
+ return m_refData;
}
#ifdef __WIN32__
bool wxBitmap::CopyFromIconOrCursor(const wxGDIImage& icon)
{
-#ifndef __WXMICROWIN__
+#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
// it may be either HICON or HCURSOR
HICON hicon = (HICON)icon.GetHandle();
{
wxLogLastError(wxT("GetIconInfo"));
- return FALSE;
+ return false;
}
wxBitmapRefData *refData = new wxBitmapRefData;
refData->m_hBitmap = (WXHBITMAP)iconInfo.hbmColor;
- // the mask returned by GetIconInfo() is inversed compared to the usual
- // wxWin convention
- refData->SetMask(wxInvertMask(iconInfo.hbmMask, w, h));
-
+#if wxUSE_WXDIB
+ // If the icon is 32 bits per pixel then it may have alpha channel data,
+ // although there are some icons that are 32 bpp but have no alpha... So
+ // convert to a DIB and manually check the 4th byte for each pixel.
+ BITMAP bm;
+ if ( ::GetObject(iconInfo.hbmColor, sizeof(BITMAP), (LPVOID)&bm)
+ && bm.bmBitsPixel == 32)
+ {
+ wxDIB dib(iconInfo.hbmColor);
+ if (dib.IsOk())
+ {
+ unsigned char* pixels = dib.GetData();
+ for (int idx=0; idx<w*h*4; idx+=4)
+ {
+ if (pixels[idx+3] != 0)
+ {
+ // If there is an alpha byte that is non-zero then set the
+ // alpha flag and bail out of the loop.
+ refData->m_hasAlpha = true;
+ break;
+ }
+ }
+ }
+ }
+#endif
+ if ( !refData->m_hasAlpha )
+ {
+ // the mask returned by GetIconInfo() is inverted compared to the usual
+ // wxWin convention
+ refData->SetMask(wxInvertMask(iconInfo.hbmMask, w, h));
+ }
// delete the old one now as we don't need it any more
::DeleteObject(iconInfo.hbmMask);
-#if WXWIN_COMPATIBILITY_2
- refData->m_ok = TRUE;
-#endif // WXWIN_COMPATIBILITY_2
-
- return TRUE;
+ return true;
#else
- return FALSE;
+ wxUnusedVar(icon);
+ return false;
#endif
}
UnRef();
if ( !cursor.Ok() )
- return FALSE;
+ return false;
-#ifdef __WIN16__
- wxFAIL_MSG( _T("don't know how to convert cursor to bitmap") );
-
- return FALSE;
-#else
return CopyFromIconOrCursor(cursor);
-#endif // Win16
}
bool wxBitmap::CopyFromIcon(const wxIcon& icon)
UnRef();
if ( !icon.Ok() )
- return FALSE;
-
- // GetIconInfo() doesn't exist under Win16 and I don't know any other way
- // to create a bitmap from icon there - but using this way we won't have
- // the mask (FIXME)
-#ifdef __WIN16__
- int width = icon.GetWidth(),
- height = icon.GetHeight();
-
- // copy the icon to the bitmap
- ScreenHDC hdcScreen;
- HDC hdc = ::CreateCompatibleDC(hdcScreen);
- HBITMAP hbitmap = ::CreateCompatibleBitmap(hdcScreen, width, height);
- HBITMAP hbmpOld = (HBITMAP)::SelectObject(hdc, hbitmap);
-
- ::DrawIcon(hdc, 0, 0, GetHiconOf(icon));
-
- ::SelectObject(hdc, hbmpOld);
- ::DeleteDC(hdc);
-
- wxBitmapRefData *refData = new wxBitmapRefData;
- m_refData = refData;
-
- refData->m_width = width;
- refData->m_height = height;
- refData->m_depth = wxDisplayDepth();
-
- refData->m_hBitmap = (WXHBITMAP)hbitmap;
-
-#if WXWIN_COMPATIBILITY_2
- refData->m_ok = TRUE;
-#endif // WXWIN_COMPATIBILITY_2
+ return false;
- return TRUE;
-#else // Win32
return CopyFromIconOrCursor(icon);
-#endif // Win16/Win32
}
+#ifndef NEVER_USE_DIB
+
bool wxBitmap::CopyFromDIB(const wxDIB& dib)
{
- wxCHECK_MSG( dib.IsOk(), FALSE, _T("invalid DIB in CopyFromDIB") );
+ wxCHECK_MSG( dib.IsOk(), false, _T("invalid DIB in CopyFromDIB") );
+#ifdef SOMETIMES_USE_DIB
HBITMAP hbitmap = dib.CreateDDB();
if ( !hbitmap )
- return FALSE;
+ return false;
+#else // ALWAYS_USE_DIB
+ HBITMAP hbitmap = ((wxDIB &)dib).Detach(); // const_cast
+#endif // SOMETIMES_USE_DIB/ALWAYS_USE_DIB
UnRef();
delete palette;
#endif // wxUSE_PALETTE
- return TRUE;
+ return true;
}
+#endif // NEVER_USE_DIB
+
wxBitmap::~wxBitmap()
{
}
wxBitmap::wxBitmap(const char bits[], int width, int height, int depth)
{
- Init();
-
#ifndef __WXMICROWIN__
wxBitmapRefData *refData = new wxBitmapRefData;
m_refData = refData;
{
// we assume that it is in XBM format which is not quite the same as
// the format CreateBitmap() wants because the order of bytes in the
- // line is inversed!
+ // line is reversed!
const size_t bytesPerLine = (width + 7) / 8;
const size_t padding = bytesPerLine % 2;
const size_t len = height * ( padding + bytesPerLine );
for ( int bits = 0; bits < 8; bits++)
{
reversed <<= 1;
- reversed |= (val & 0x01);
+ reversed |= (unsigned char)(val & 0x01);
val >>= 1;
}
*dst++ = reversed;
// Create from XPM data
bool wxBitmap::CreateFromXpm(const char **data)
{
-#if wxUSE_IMAGE && wxUSE_XPM
- Init();
-
- wxCHECK_MSG( data != NULL, FALSE, wxT("invalid bitmap data") )
+#if wxUSE_IMAGE && wxUSE_XPM && wxUSE_WXDIB
+ wxCHECK_MSG( data != NULL, false, wxT("invalid bitmap data") )
wxXPMDecoder decoder;
wxImage img = decoder.ReadData(data);
- wxCHECK_MSG( img.Ok(), FALSE, wxT("invalid bitmap data") )
+ wxCHECK_MSG( img.Ok(), false, wxT("invalid bitmap data") )
*this = wxBitmap(img);
- return TRUE;
+ return true;
#else
- return FALSE;
+ wxUnusedVar(data);
+ return false;
#endif
}
wxBitmap::wxBitmap(int w, int h, int d)
{
- Init();
-
(void)Create(w, h, d);
}
wxBitmap::wxBitmap(int w, int h, const wxDC& dc)
{
- Init();
-
(void)Create(w, h, dc);
}
wxBitmap::wxBitmap(void *data, long type, int width, int height, int depth)
{
- Init();
-
(void)Create(data, type, width, height, depth);
}
wxBitmap::wxBitmap(const wxString& filename, wxBitmapType type)
{
- Init();
-
LoadFile(filename, (int)type);
}
bool wxBitmap::Create(int width, int height, const wxDC& dc)
{
- wxCHECK_MSG( dc.Ok(), FALSE, _T("invalid HDC in wxBitmap::Create()") );
+ wxCHECK_MSG( dc.Ok(), false, _T("invalid HDC in wxBitmap::Create()") );
return DoCreate(width, height, -1, dc.GetHDC());
}
GetBitmapData()->m_width = w;
GetBitmapData()->m_height = h;
- HBITMAP hbmp;
+ HBITMAP hbmp wxDUMMY_INITIALIZE(0);
+#ifndef NEVER_USE_DIB
if ( wxShouldCreateDIB(w, h, d, hdc) )
{
if ( d == -1 )
wxDIB dib(w, h, d);
if ( !dib.IsOk() )
- return FALSE;
+ return false;
// don't delete the DIB section in dib object dtor
hbmp = dib.Detach();
- GetBitmapData()->m_isDIB = TRUE;
+ GetBitmapData()->m_isDIB = true;
GetBitmapData()->m_depth = d;
}
else // create a DDB
+#endif // NEVER_USE_DIB
{
- if ( d == -1 )
- d = wxDisplayDepth();
-
- GetBitmapData()->m_depth = d;
-
+#ifndef ALWAYS_USE_DIB
#ifndef __WXMICROWIN__
if ( d > 0 )
{
{
wxLogLastError(wxT("CreateBitmap"));
}
+
+ GetBitmapData()->m_depth = d;
}
- else
+ else // d == 0, create bitmap compatible with the screen
#endif // !__WXMICROWIN__
{
ScreenHDC dc;
GetBitmapData()->m_depth = wxDisplayDepth();
}
+#endif // !ALWAYS_USE_DIB
}
SetHBITMAP((WXHBITMAP)hbmp);
-#if WXWIN_COMPATIBILITY_2
- GetBitmapData()->m_ok = hbmp != 0;
-#endif // WXWIN_COMPATIBILITY_2
-
return Ok();
}
if (hBitmap == NULL)
{
::ReleaseDC(NULL, hScreenDC);
- return FALSE;
+ return false;
}
HDC hMemDC = ::CreateCompatibleDC(hScreenDC);
if (!hMaskBitmap)
{
- hasMask = FALSE;
+ hasMask = false;
}
else
{
hOldMaskBitmap = ::SelectObject( hMaskDC, hMaskBitmap);
}
#else
- hasMask = FALSE;
+ hasMask = false;
#endif
}
SetPalette(image.GetPalette());
#endif // wxUSE_PALETTE
-#if WXWIN_COMPATIBILITY_2
- // check the wxBitmap object
- GetBitmapData()->SetOk();
-#endif // WXWIN_COMPATIBILITY_2
-
- return TRUE;
+ return true;
}
wxImage wxBitmap::ConvertToImage() const
// wxImage to/from conversions
// ----------------------------------------------------------------------------
+#if wxUSE_WXDIB
+
bool wxBitmap::CreateFromImage(const wxImage& image, int depth)
{
return CreateFromImage(image, depth, 0);
bool wxBitmap::CreateFromImage(const wxImage& image, const wxDC& dc)
{
- wxCHECK_MSG( dc.Ok(), FALSE,
+ wxCHECK_MSG( dc.Ok(), false,
_T("invalid HDC in wxBitmap::CreateFromImage()") );
return CreateFromImage(image, -1, dc.GetHDC());
}
-bool wxBitmap::CreateFromImage(const wxImage& image, int depth, WXHDC hdc )
+bool wxBitmap::CreateFromImage(const wxImage& image, int depth, WXHDC hdc)
{
- wxCHECK_MSG( image.Ok(), FALSE, wxT("invalid image") );
+ wxCHECK_MSG( image.Ok(), false, wxT("invalid image") );
UnRef();
wxDIB dib(image);
if ( !dib.IsOk() )
- return FALSE;
-
+ return false;
+ if (depth == -1)
+ depth = dib.GetDepth(); // Get depth from image if none specified
// store the bitmap parameters
wxBitmapRefData *refData = new wxBitmapRefData;
// next either store DIB as is or create a DDB from it
- HBITMAP hbitmap;
+ HBITMAP hbitmap wxDUMMY_INITIALIZE(0);
// are we going to use DIB?
- if ( wxShouldCreateDIB(w, h, depth, hdc) )
+ //
+ // NB: DDBs don't support alpha so if we have alpha channel we must use DIB
+ if ( image.HasAlpha() || wxShouldCreateDIB(w, h, depth, hdc) )
{
// don't delete the DIB section in dib object dtor
hbitmap = dib.Detach();
- refData->m_isDIB = TRUE;
- refData->m_depth = dib.GetDepth();
+ refData->m_isDIB = true;
+ refData->m_depth = depth;
}
+#ifndef ALWAYS_USE_DIB
else // we need to convert DIB to DDB
{
hbitmap = dib.CreateDDB((HDC)hdc);
- refData->m_depth = depth == -1 ? wxDisplayDepth() : depth;
+ refData->m_depth = depth;
}
+#endif // !ALWAYS_USE_DIB
// validate this object
SetHBITMAP((WXHBITMAP)hbitmap);
-#if WXWIN_COMPATIBILITY_2
- m_refData->m_ok = TRUE;
-#endif // WXWIN_COMPATIBILITY_2
-
// finally also set the mask if we have one
if ( image.HasMask() )
{
- SetMask(new wxMask(*this, wxColour(image.GetMaskRed(),
- image.GetMaskGreen(),
- image.GetMaskBlue())));
+ const size_t len = 2*((w+15)/16);
+ BYTE *src = image.GetData();
+ BYTE *data = new BYTE[h*len];
+ memset(data, 0, h*len);
+ BYTE r = image.GetMaskRed(),
+ g = image.GetMaskGreen(),
+ b = image.GetMaskBlue();
+ BYTE *dst = data;
+ for ( int y = 0; y < h; y++, dst += len )
+ {
+ BYTE *dstLine = dst;
+ BYTE mask = 0x80;
+ for ( int x = 0; x < w; x++, src += 3 )
+ {
+ if (src[0] != r || src[1] != g || src[2] != b)
+ *dstLine |= mask;
+
+ if ( (mask >>= 1) == 0 )
+ {
+ dstLine++;
+ mask = 0x80;
+ }
+ }
+ }
+
+ hbitmap = ::CreateBitmap(w, h, 1, 1, data);
+ if ( !hbitmap )
+ {
+ wxLogLastError(_T("CreateBitmap(mask)"));
+ }
+ else
+ {
+ SetMask(new wxMask((WXHBITMAP)hbitmap));
+ }
+
+ delete[] data;
}
- return TRUE;
+ return true;
}
wxImage wxBitmap::ConvertToImage() const
{
- wxImage image;
-
- wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") );
+ // convert DDB to DIB
+ wxDIB dib(*this);
- // create an wxImage object
- int width = GetWidth();
- int height = GetHeight();
- image.Create( width, height );
- unsigned char *data = image.GetData();
- if( !data )
+ if ( !dib.IsOk() )
{
- wxFAIL_MSG( wxT("could not allocate data for image") );
return wxNullImage;
}
- // calc the number of bytes per scanline and padding in the DIB
- int bytePerLine = width*3;
- int sizeDWORD = sizeof( DWORD );
- int lineBoundary = bytePerLine % sizeDWORD;
- int padding = 0;
- if( lineBoundary > 0 )
- {
- padding = sizeDWORD - lineBoundary;
- bytePerLine += padding;
- }
-
- // create a DIB header
- int headersize = sizeof(BITMAPINFOHEADER);
- BITMAPINFO *lpDIBh = (BITMAPINFO *) malloc( headersize );
- if( !lpDIBh )
+ // and then DIB to our wxImage
+ wxImage image = dib.ConvertToImage();
+ if ( !image.Ok() )
{
- wxFAIL_MSG( wxT("could not allocate data for DIB header") );
- free( data );
return wxNullImage;
}
- // Fill in the DIB header
- lpDIBh->bmiHeader.biSize = headersize;
- lpDIBh->bmiHeader.biWidth = width;
- lpDIBh->bmiHeader.biHeight = -height;
- lpDIBh->bmiHeader.biSizeImage = bytePerLine * height;
- lpDIBh->bmiHeader.biPlanes = 1;
- lpDIBh->bmiHeader.biBitCount = 24;
- lpDIBh->bmiHeader.biCompression = BI_RGB;
- lpDIBh->bmiHeader.biClrUsed = 0;
- // These seem not really needed for our purpose here.
- lpDIBh->bmiHeader.biClrImportant = 0;
- lpDIBh->bmiHeader.biXPelsPerMeter = 0;
- lpDIBh->bmiHeader.biYPelsPerMeter = 0;
- // memory for DIB data
- unsigned char *lpBits;
- lpBits = (unsigned char *) malloc( lpDIBh->bmiHeader.biSizeImage );
- if( !lpBits )
- {
- wxFAIL_MSG( wxT("could not allocate data for DIB") );
- free( data );
- free( lpDIBh );
- return wxNullImage;
- }
-
- // copy data from the device-dependent bitmap to the DIB
- HDC hdc = ::GetDC(NULL);
- HBITMAP hbitmap;
- hbitmap = (HBITMAP) GetHBITMAP();
- ::GetDIBits( hdc, hbitmap, 0, height, lpBits, lpDIBh, DIB_RGB_COLORS );
-
- // copy DIB data into the wxImage object
- int i, j;
- unsigned char *ptdata = data;
- unsigned char *ptbits = lpBits;
- for( i=0; i<height; i++ )
- {
- for( j=0; j<width; j++ )
- {
- *(ptdata++) = *(ptbits+2);
- *(ptdata++) = *(ptbits+1);
- *(ptdata++) = *(ptbits );
- ptbits += 3;
- }
- ptbits += padding;
- }
- // similarly, set data according to the possible mask bitmap
- if( GetMask() && GetMask()->GetMaskBitmap() )
+ // now do the same for the mask, if we have any
+ HBITMAP hbmpMask = GetMask() ? (HBITMAP) GetMask()->GetMaskBitmap() : NULL;
+ if ( hbmpMask )
{
- hbitmap = (HBITMAP) GetMask()->GetMaskBitmap();
- // memory DC created, color set, data copied, and memory DC deleted
- HDC memdc = ::CreateCompatibleDC( hdc );
- ::SetTextColor( memdc, RGB( 0, 0, 0 ) );
- ::SetBkColor( memdc, RGB( 255, 255, 255 ) );
- ::GetDIBits( memdc, hbitmap, 0, height, lpBits, lpDIBh, DIB_RGB_COLORS );
- ::DeleteDC( memdc );
- // background color set to RGB(16,16,16) in consistent with wxGTK
- unsigned char r=16, g=16, b=16;
- ptdata = data;
- ptbits = lpBits;
- for( i=0; i<height; i++ )
+ wxDIB dibMask(hbmpMask);
+ if ( dibMask.IsOk() )
{
- for( j=0; j<width; j++ )
+ // TODO: use wxRawBitmap to iterate over DIB
+
+ // we hard code the mask colour for now but we could also make an
+ // effort (and waste time) to choose a colour not present in the
+ // image already to avoid having to fudge the pixels below --
+ // whether it's worth to do it is unclear however
+ static const int MASK_RED = 1;
+ static const int MASK_GREEN = 2;
+ static const int MASK_BLUE = 3;
+ static const int MASK_BLUE_REPLACEMENT = 2;
+
+ const int h = dibMask.GetHeight();
+ const int w = dibMask.GetWidth();
+ const int bpp = dibMask.GetDepth();
+ const int maskBytesPerPixel = bpp >> 3;
+ const int maskBytesPerLine = wxDIB::GetLineSize(w, bpp);
+ unsigned char *data = image.GetData();
+
+ // remember that DIBs are stored in bottom to top order
+ unsigned char *
+ maskLineStart = dibMask.GetData() + ((h - 1) * maskBytesPerLine);
+
+ for ( int y = 0; y < h; y++, maskLineStart -= maskBytesPerLine )
{
- if( *ptbits != 0 )
- ptdata += 3;
- else
+ // traverse one mask DIB line
+ unsigned char *mask = maskLineStart;
+ for ( int x = 0; x < w; x++, mask += maskBytesPerPixel )
{
- *(ptdata++) = r;
- *(ptdata++) = g;
- *(ptdata++) = b;
+ // should this pixel be transparent?
+ if ( *mask )
+ {
+ // no, check that it isn't transparent by accident
+ if ( (data[0] == MASK_RED) &&
+ (data[1] == MASK_GREEN) &&
+ (data[2] == MASK_BLUE) )
+ {
+ // we have to fudge the colour a bit to prevent
+ // this pixel from appearing transparent
+ data[2] = MASK_BLUE_REPLACEMENT;
+ }
+
+ data += 3;
+ }
+ else // yes, transparent pixel
+ {
+ *data++ = MASK_RED;
+ *data++ = MASK_GREEN;
+ *data++ = MASK_BLUE;
+ }
}
- ptbits += 3;
}
- ptbits += padding;
+
+ image.SetMaskColour(MASK_RED, MASK_GREEN, MASK_BLUE);
}
- image.SetMaskColour( r, g, b );
- image.SetMask( TRUE );
}
- else
- {
- image.SetMask( FALSE );
- }
- // free allocated resources
- ::ReleaseDC(NULL, hdc);
- free(lpDIBh);
- free(lpBits);
return image;
}
+#endif // wxUSE_WXDIB
+
#endif // wxUSE_IMAGE
// ----------------------------------------------------------------------------
return handler->LoadFile(this, filename, type, -1, -1);
}
-#if wxUSE_IMAGE
- else
+#if wxUSE_IMAGE && wxUSE_WXDIB
+ else // no bitmap handler found
{
wxImage image;
if ( image.LoadFile( filename, type ) && image.Ok() )
{
*this = wxBitmap(image);
- return TRUE;
+ return true;
}
}
#endif // wxUSE_IMAGE
- return FALSE;
+ return false;
}
bool wxBitmap::Create(void *data, long type, int width, int height, int depth)
{
wxLogDebug(wxT("Failed to create bitmap: no bitmap handler for type %ld defined."), type);
- return FALSE;
+ return false;
}
m_refData = new wxBitmapRefData;
{
return handler->SaveFile(this, filename, type, palette);
}
-#if wxUSE_IMAGE
- else
+#if wxUSE_IMAGE && wxUSE_WXDIB
+ else // no bitmap handler found
{
// FIXME what about palette? shouldn't we use it?
wxImage image = ConvertToImage();
}
#endif // wxUSE_IMAGE
- return FALSE;
+ return false;
}
// ----------------------------------------------------------------------------
(rect.y+rect.height <= GetHeight()),
wxNullBitmap, wxT("Invalid bitmap or bitmap region") );
- wxBitmap ret( rect.width, rect.height );
+ wxBitmap ret( rect.width, rect.height, GetDepth() );
wxASSERT_MSG( ret.Ok(), wxT("GetSubBitmap error") );
#ifndef __WXMICROWIN__
- // TODO: copy alpha channel data if any
+ // handle alpha channel, if any
+ if (HasAlpha())
+ ret.UseAlpha();
// copy bitmap data
MemoryHDC dcSrc,
// wxBitmap accessors
// ----------------------------------------------------------------------------
+#if wxUSE_PALETTE
wxPalette* wxBitmap::GetPalette() const
{
return GetBitmapData() ? &GetBitmapData()->m_bitmapPalette
: (wxPalette *) NULL;
}
+#endif
wxMask *wxBitmap::GetMask() const
{
return GetBitmapData() ? GetBitmapData()->GetMask() : (wxMask *) NULL;
}
+wxBitmap wxBitmap::GetMaskBitmap() const
+{
+ wxBitmap bmp;
+ wxMask *mask = GetMask();
+ if ( mask )
+ bmp.SetHBITMAP(mask->GetMaskBitmap());
+ return bmp;
+}
+
#ifdef __WXDEBUG__
wxDC *wxBitmap::GetSelectedInto() const
void wxBitmap::SetPalette(const wxPalette& palette)
{
- EnsureHasData();
+ AllocExclusive();
GetBitmapData()->m_bitmapPalette = palette;
}
void wxBitmap::SetMask(wxMask *mask)
{
- EnsureHasData();
+ AllocExclusive();
GetBitmapData()->SetMask(mask);
}
-#if WXWIN_COMPATIBILITY_2
-
-void wxBitmap::SetOk(bool isOk)
-{
- EnsureHasData();
-
- GetBitmapData()->m_ok = isOk;
-}
-
-#endif // WXWIN_COMPATIBILITY_2
-
#if WXWIN_COMPATIBILITY_2_4
void wxBitmap::SetQuality(int WXUNUSED(quality))
// raw bitmap access support
// ----------------------------------------------------------------------------
-bool wxBitmap::GetRawData(wxRawBitmapData *data)
+#ifdef wxHAVE_RAW_BITMAP
+void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)
{
- wxCHECK_MSG( data, FALSE, _T("NULL pointer in wxBitmap::GetRawData") );
-
+#if wxUSE_WXDIB
if ( !Ok() )
{
// no bitmap, no data (raw or otherwise)
- return FALSE;
+ return NULL;
}
// if we're already a DIB we can access our data directly, but if not we
HBITMAP hDIB;
if ( !GetBitmapData()->m_isDIB )
{
- wxCHECK_MSG( !GetBitmapData()->m_dib, FALSE,
+ wxCHECK_MSG( !GetBitmapData()->m_dib, NULL,
_T("GetRawData() may be called only once") );
wxDIB *dib = new wxDIB(*this);
{
delete dib;
- return FALSE;
+ return NULL;
}
// we'll free it in UngetRawData()
{
wxFAIL_MSG( _T("failed to get DIBSECTION from a DIB?") );
- return FALSE;
+ return NULL;
}
- // ok, store the relevant info in wxRawBitmapData
+ // check that the bitmap is in correct format
+ if ( ds.dsBm.bmBitsPixel != bpp )
+ {
+ wxFAIL_MSG( _T("incorrect bitmap type in wxBitmap::GetRawData()") );
+
+ return NULL;
+ }
+
+ // ok, store the relevant info in wxPixelDataBase
const LONG h = ds.dsBm.bmHeight;
- data->m_width = ds.dsBm.bmWidth;
- data->m_height = h;
- data->m_bypp = ds.dsBm.bmBitsPixel / 8;
+ data.m_width = ds.dsBm.bmWidth;
+ data.m_height = h;
// remember that DIBs are stored in top to bottom order!
- const LONG bytesPerRow = ds.dsBm.bmWidthBytes;
- data->m_stride = -bytesPerRow;
- data->m_pixels = (unsigned char *)ds.dsBm.bmBits;
+ // (We can't just use ds.dsBm.bmWidthBytes here, because it isn't always a
+ // multiple of 2, as required by the documentation. So we use the official
+ // formula, which we already use elsewhere.)
+ const LONG bytesPerRow =
+ wxDIB::GetLineSize(ds.dsBm.bmWidth, ds.dsBm.bmBitsPixel);
+ data.m_stride = -bytesPerRow;
+
+ char *bits = (char *)ds.dsBm.bmBits;
if ( h > 1 )
{
- data->m_pixels += (h - 1)*bytesPerRow;
+ bits += (h - 1)*bytesPerRow;
}
- return TRUE;
+ return bits;
+#else
+ return NULL;
+#endif
}
-void wxBitmap::UngetRawData(wxRawBitmapData *data)
+void wxBitmap::UngetRawData(wxPixelDataBase& dataBase)
{
- wxCHECK_RET( data, _T("NULL pointer in wxBitmap::UngetRawData()") );
-
+#if wxUSE_WXDIB
if ( !Ok() )
return;
- if ( !*data )
+ if ( !&dataBase )
{
// invalid data, don't crash -- but don't assert neither as we're
- // called automatically from wxRawBitmapData dtor and so there is no
+ // called automatically from wxPixelDataBase dtor and so there is no
// way to prevent this from happening
return;
}
- // AlphaBlend() wants to have premultiplied source alpha but wxRawBitmap
- // API uses normal, not premultiplied, colours, so adjust them here now
- wxRawBitmapIterator p(*data);
-
- const int w = data->GetWidth();
- const int h = data->GetHeight();
-
- for ( int y = 0; y < h; y++ )
- {
- wxRawBitmapIterator rowStart = p;
-
- for ( int x = 0; x < w; x++ )
- {
- const unsigned alpha = p.Alpha();
-
- p.Red() = (p.Red() * alpha + 127) / 255;
- p.Blue() = (p.Blue() * alpha + 127) / 255;
- p.Green() = (p.Green() * alpha + 127) / 255;
-
- ++p;
- }
-
- p = rowStart;
- p.OffsetY(1);
- }
-
// if we're a DDB we need to convert DIB back to DDB now to make the
- // changes made via wxRawBitmapData effective
+ // changes made via raw bitmap access effective
if ( !GetBitmapData()->m_isDIB )
{
wxDIB *dib = GetBitmapData()->m_dib;
delete dib;
}
+#endif // wxUSE_WXDIB
}
+#endif // #ifdef wxHAVE_RAW_BITMAP
// ----------------------------------------------------------------------------
// wxMask
bool wxMask::Create(const wxBitmap& bitmap)
{
#ifndef __WXMICROWIN__
- wxCHECK_MSG( bitmap.Ok() && bitmap.GetDepth() == 1, FALSE,
+ wxCHECK_MSG( bitmap.Ok() && bitmap.GetDepth() == 1, false,
_T("can't create mask from invalid or not monochrome bitmap") );
if ( m_maskBitmap )
DeleteDC(srcDC);
SelectObject(destDC, 0);
DeleteDC(destDC);
- return TRUE;
+ return true;
#else
- return FALSE;
+ wxUnusedVar(bitmap);
+ return false;
#endif
}
}
#endif // wxUSE_PALETTE
- return FALSE;
+ return false;
}
// Create a mask from a bitmap and a colour indicating
bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
{
#ifndef __WXMICROWIN__
- wxCHECK_MSG( bitmap.Ok(), FALSE, _T("invalid bitmap in wxMask::Create") );
+ wxCHECK_MSG( bitmap.Ok(), false, _T("invalid bitmap in wxMask::Create") );
if ( m_maskBitmap )
{
wxLogLastError(wxT("CreateCompatibleDC"));
}
- bool ok = TRUE;
+ bool ok = true;
// SelectObject() will fail
wxASSERT_MSG( !bitmap.GetSelectedInto(),
{
wxLogLastError(wxT("SelectObject"));
- ok = FALSE;
+ ok = false;
}
HGDIOBJ hbmpDstOld = ::SelectObject(destDC, (HBITMAP)m_maskBitmap);
{
wxLogLastError(wxT("SelectObject"));
- ok = FALSE;
+ ok = false;
}
if ( ok )
return ok;
#else // __WXMICROWIN__
- return FALSE;
+ wxUnusedVar(bitmap);
+ wxUnusedVar(colour);
+ return false;
#endif // __WXMICROWIN__/!__WXMICROWIN__
}
{
wxBitmap *bitmap = wxDynamicCast(image, wxBitmap);
- return bitmap ? Create(bitmap, data, flags, width, height, depth) : FALSE;
+ return bitmap ? Create(bitmap, data, flags, width, height, depth) : false;
}
bool wxBitmapHandler::Load(wxGDIImage *image,
{
wxBitmap *bitmap = wxDynamicCast(image, wxBitmap);
- return bitmap ? LoadFile(bitmap, name, flags, width, height) : FALSE;
+ return bitmap ? LoadFile(bitmap, name, flags, width, height) : false;
}
bool wxBitmapHandler::Save(wxGDIImage *image,
{
wxBitmap *bitmap = wxDynamicCast(image, wxBitmap);
- return bitmap ? SaveFile(bitmap, name, type) : FALSE;
+ return bitmap ? SaveFile(bitmap, name, type) : false;
}
bool wxBitmapHandler::Create(wxBitmap *WXUNUSED(bitmap),
int WXUNUSED(height),
int WXUNUSED(depth))
{
- return FALSE;
+ return false;
}
bool wxBitmapHandler::LoadFile(wxBitmap *WXUNUSED(bitmap),
int WXUNUSED(desiredWidth),
int WXUNUSED(desiredHeight))
{
- return FALSE;
+ return false;
}
bool wxBitmapHandler::SaveFile(wxBitmap *WXUNUSED(bitmap),
int WXUNUSED(type),
const wxPalette *WXUNUSED(palette))
{
- return FALSE;
+ return false;
}
// ----------------------------------------------------------------------------
HPALETTE hPal, LPBITMAPINFO* lpDIBHeader)
{
unsigned long i, headerSize;
- LPBITMAPINFO lpDIBheader = NULL;
- LPPALETTEENTRY lpPe = NULL;
-
// Allocate space for a DIB header
headerSize = (sizeof(BITMAPINFOHEADER) + (256 * sizeof(PALETTEENTRY)));
- lpDIBheader = (BITMAPINFO *) malloc(headerSize);
- lpPe = (PALETTEENTRY *)((BYTE*)lpDIBheader + sizeof(BITMAPINFOHEADER));
+ LPBITMAPINFO lpDIBheader = (BITMAPINFO *) malloc(headerSize);
+ LPPALETTEENTRY lpPe = (PALETTEENTRY *)((BYTE*)lpDIBheader + sizeof(BITMAPINFOHEADER));
GetPaletteEntries(hPal, 0, 256, lpPe);
// this value must be 1, 4, 8 or 24 so PixelDepth can only be
lpDIBheader->bmiHeader.biBitCount = (WORD)(bitsPerPixel);
lpDIBheader->bmiHeader.biCompression = BI_RGB;
- lpDIBheader->bmiHeader.biSizeImage = xSize * abs(ySize) * bitsPerPixel >> 3;
+ lpDIBheader->bmiHeader.biSizeImage = (xSize * abs(ySize) * bitsPerPixel) >> 3;
lpDIBheader->bmiHeader.biClrUsed = 256;
*lpDIBHeader = lpDIBheader;
- return TRUE;
+ return true;
}
void wxFreeDIB(LPBITMAPINFO lpDIBHeader)
return 0;
}
- wxMask *mask = bmp.GetMask();
+ if ( bmp.HasAlpha() )
+ {
+ // Create an empty mask bitmap.
+ // it doesn't seem to work if we mess with the mask at all.
+ HBITMAP hMonoBitmap = CreateBitmap(bmp.GetWidth(),bmp.GetHeight(),1,1,NULL);
+
+ ICONINFO iconInfo;
+ wxZeroMemory(iconInfo);
+ iconInfo.fIcon = iconWanted; // do we want an icon or a cursor?
+ if ( !iconWanted )
+ {
+ iconInfo.xHotspot = hotSpotX;
+ iconInfo.yHotspot = hotSpotY;
+ }
+
+ iconInfo.hbmMask = hMonoBitmap;
+ iconInfo.hbmColor = GetHbitmapOf(bmp);
+
+ HICON hicon = ::CreateIconIndirect(&iconInfo);
+
+ ::DeleteObject(hMonoBitmap);
+
+ return hicon;
+ }
+
+ wxMask* mask = bmp.GetMask();
+
if ( !mask )
{
// we must have a mask for an icon, so even if it's probably incorrect,
}
ICONINFO iconInfo;
+ wxZeroMemory(iconInfo);
iconInfo.fIcon = iconWanted; // do we want an icon or a cursor?
if ( !iconWanted )
{
HICON hicon = ::CreateIconIndirect(&iconInfo);
- if ( !bmp.GetMask() )
+ if ( !bmp.GetMask() && !bmp.HasAlpha() )
{
// we created the mask, now delete it
delete mask;
HICON wxBitmapToHICON(const wxBitmap& bmp)
{
- return wxBitmapToIconOrCursor(bmp, TRUE, 0, 0);
+ return wxBitmapToIconOrCursor(bmp, true, 0, 0);
}
HCURSOR wxBitmapToHCURSOR(const wxBitmap& bmp, int hotSpotX, int hotSpotY)
{
- return (HCURSOR)wxBitmapToIconOrCursor(bmp, FALSE, hotSpotX, hotSpotY);
+ return (HCURSOR)wxBitmapToIconOrCursor(bmp, false, hotSpotX, hotSpotY);
}
HBITMAP wxInvertMask(HBITMAP hbmpMask, int w, int h)
wxLogLastError(wxT("CreateBitmap"));
}
- ::SelectObject(hdcSrc, hbmpMask);
- ::SelectObject(hdcDst, hbmpInvMask);
+ HGDIOBJ srcTmp = ::SelectObject(hdcSrc, hbmpMask);
+ HGDIOBJ dstTmp = ::SelectObject(hdcDst, hbmpInvMask);
if ( !::BitBlt(hdcDst, 0, 0, w, h,
hdcSrc, 0, 0,
NOTSRCCOPY) )
wxLogLastError(wxT("BitBlt"));
}
+ // Deselect objects
+ SelectObject(hdcSrc,srcTmp);
+ SelectObject(hdcDst,dstTmp);
+
::DeleteDC(hdcSrc);
::DeleteDC(hdcDst);
projects / wxWidgets.git / blobdiff