// headers
// ----------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma implementation "bitmap.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
{
public:
wxBitmapRefData();
+ wxBitmapRefData(const wxBitmapRefData& data);
virtual ~wxBitmapRefData() { Free(); }
virtual void Free();
// optional mask for transparent drawing
wxMask *m_bitmapMask;
- DECLARE_NO_COPY_CLASS(wxBitmapRefData)
+
+ // not implemented
+ wxBitmapRefData& operator=(const wxBitmapRefData&);
};
// ----------------------------------------------------------------------------
#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()
// 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__
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);
UnRef();
if ( !cursor.Ok() )
- return FALSE;
+ return false;
return CopyFromIconOrCursor(cursor);
}
UnRef();
if ( !icon.Ok() )
- return FALSE;
+ return false;
return CopyFromIconOrCursor(icon);
}
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
delete palette;
#endif // wxUSE_PALETTE
- return TRUE;
+ return true;
}
#endif // NEVER_USE_DIB
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
-#if wxUSE_IMAGE && wxUSE_XPM
bool wxBitmap::CreateFromXpm(const char **data)
-#else
-bool wxBitmap::CreateFromXpm(const char **WXUNUSED(data))
-#endif
{
-#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());
}
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
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
- return TRUE;
+ return true;
}
wxImage wxBitmap::ConvertToImage() const
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)
{
- 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;
// 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 ? dib.GetDepth() : depth;
+ refData->m_depth = depth;
}
#endif // !ALWAYS_USE_DIB
// 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
return handler->LoadFile(this, filename, type, -1, -1);
}
-#if wxUSE_IMAGE
+#if wxUSE_IMAGE && wxUSE_WXDIB
else // no bitmap handler found
{
wxImage image;
{
*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
+#if wxUSE_IMAGE && wxUSE_WXDIB
else // no bitmap handler found
{
// FIXME what about palette? shouldn't we use it?
}
#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,
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);
}
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);
data.m_height = h;
// remember that DIBs are stored in top to bottom order!
- const LONG bytesPerRow = ds.dsBm.bmWidthBytes;
+ // (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 ( !Ok() )
return;
- // the cast is ugly but we can't do without it and without making this
- // function template (and hence inline) unfortunately
- typedef wxPixelData<wxBitmap, wxAlphaPixelFormat> PixelData;
- PixelData& data = (PixelData &)dataBase;
-
- if ( !data )
+ if ( !&dataBase )
{
// invalid data, don't crash -- but don't assert neither as we're
// called automatically from wxPixelDataBase dtor and so there is no
return;
}
- if ( GetBitmapData()->m_hasAlpha )
- {
- // AlphaBlend() wants to have premultiplied source alpha but
- // wxRawBitmap API uses normal, not premultiplied, colours, so adjust
- // them here now
- PixelData::Iterator p(data);
-
- const int w = data.GetWidth();
- const int h = data.GetHeight();
-
- for ( int y = 0; y < h; y++ )
- {
- PixelData::Iterator 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(data, 1);
- }
- }
-
// if we're a DDB we need to convert DIB back to DDB now to make the
// changes made via raw bitmap access effective
if ( !GetBitmapData()->m_isDIB )
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;
}
// ----------------------------------------------------------------------------
// 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,
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)
// Deselect objects
SelectObject(hdcSrc,srcTmp);
SelectObject(hdcDst,dstTmp);
-
+
::DeleteDC(hdcSrc);
::DeleteDC(hdcDst);
projects / wxWidgets.git / blobdiff