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

added alpha channel support for mask bitmaps

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19520 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2003-03-06 21:20:19 +00:00
parent 3ca22d5e92
commit 8dd336cba3
2 changed files with 66 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/mac/bitmap.cpp
View File

@@ -565,7 +565,7 @@ wxBitmap wxBitmap::GetSubBitmap(const wxRect &rect) const
RGBColor color; RGBColor color;
mask = (GWorldPtr) GetMask()->GetMaskBitmap(); mask = (GWorldPtr) GetMask()->GetMaskBitmap();
submask = wxMacCreateGWorld(rect.width, rect.height, 1); submask = wxMacCreateGWorld(rect.width, rect.height, GetMask()->GetDepth() );
LockPixels(GetGWorldPixMap(mask)); LockPixels(GetGWorldPixMap(mask));
LockPixels(GetGWorldPixMap(submask)); LockPixels(GetGWorldPixMap(submask));
@@ -755,7 +755,33 @@ wxBitmap::wxBitmap(const wxImage& image, int depth)
destinationBase += ((**pixMap).rowBytes & 0x7fff); destinationBase += ((**pixMap).rowBytes & 0x7fff);
destination = (unsigned char*) destinationBase ; destination = (unsigned char*) destinationBase ;
} }
if ( image.HasMask() ) if ( image.HasAlpha() )
{
unsigned char *alpha = image.GetAlpha();
wxColour maskcolor(image.GetMaskRed(), image.GetMaskGreen(), image.GetMaskBlue());
RGBColor color ;
wxBitmap maskBitmap ;
maskBitmap.Create( width, height, 24);
LockPixels( GetGWorldPixMap( (GWorldPtr) maskBitmap.GetHBITMAP()) );
SetGWorld( (GWorldPtr) maskBitmap.GetHBITMAP(), NULL);
for (int y = 0; y < height; y++)
{
for (int x = 0; x < width; x++)
{
memset( &color , 255 - *alpha , sizeof( color ) );
SetCPixel(x,y, &color);
alpha += 1 ;
}
} // for height
SetGWorld( (GWorldPtr) GetHBITMAP(), NULL);
SetMask(new wxMask( maskBitmap ));
UnlockPixels( GetGWorldPixMap( (GWorldPtr) maskBitmap.GetHBITMAP()) );
}
else if ( image.HasMask() )
{ {
data = image.GetData(); data = image.GetData();
@@ -777,7 +803,7 @@ wxBitmap::wxBitmap(const wxImage& image, int depth)
SetCPixel(x,y, &white); SetCPixel(x,y, &white);
} }
else { else {
SetCPixel(x,y, &black); SetCPixel(x,y, &black);
} }
data += 3 ; data += 3 ;
} }
@@ -1122,10 +1148,8 @@ bool wxMask::Create(const wxBitmap& bitmap)
wxCHECK_MSG( bitmap.Ok(), false, wxT("Invalid bitmap")); wxCHECK_MSG( bitmap.Ok(), false, wxT("Invalid bitmap"));
wxCHECK_MSG(bitmap.GetDepth() == 1, false, m_depth = bitmap.GetDepth() ;
wxT("Cannot create mask from colour bitmap")); m_maskBitmap = wxMacCreateGWorld(bitmap.GetWidth(), bitmap.GetHeight(), bitmap.GetDepth() );
m_maskBitmap = wxMacCreateGWorld(bitmap.GetWidth(), bitmap.GetHeight(), 1);
Rect rect = { 0,0, bitmap.GetHeight(), bitmap.GetWidth() }; Rect rect = { 0,0, bitmap.GetHeight(), bitmap.GetWidth() };
LockPixels( GetGWorldPixMap( (GWorldPtr) m_maskBitmap) ); LockPixels( GetGWorldPixMap( (GWorldPtr) m_maskBitmap) );
@@ -1164,6 +1188,7 @@ bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
wxCHECK_MSG( bitmap.Ok(), false, wxT("Illigal bitmap")); wxCHECK_MSG( bitmap.Ok(), false, wxT("Illigal bitmap"));
m_maskBitmap = wxMacCreateGWorld( bitmap.GetWidth() , bitmap.GetHeight() , 1 ); m_maskBitmap = wxMacCreateGWorld( bitmap.GetWidth() , bitmap.GetHeight() , 1 );
m_depth = 1 ;
LockPixels( GetGWorldPixMap( (GWorldPtr) m_maskBitmap ) ); LockPixels( GetGWorldPixMap( (GWorldPtr) m_maskBitmap ) );
LockPixels( GetGWorldPixMap( (GWorldPtr) bitmap.GetHBITMAP() ) ); LockPixels( GetGWorldPixMap( (GWorldPtr) bitmap.GetHBITMAP() ) );
RGBColor maskColor = MAC_WXCOLORREF(colour.GetPixel()); RGBColor maskColor = MAC_WXCOLORREF(colour.GetPixel());

39
src/mac/carbon/bitmap.cpp
View File

@@ -565,7 +565,7 @@ wxBitmap wxBitmap::GetSubBitmap(const wxRect &rect) const
RGBColor color; RGBColor color;
mask = (GWorldPtr) GetMask()->GetMaskBitmap(); mask = (GWorldPtr) GetMask()->GetMaskBitmap();
submask = wxMacCreateGWorld(rect.width, rect.height, 1); submask = wxMacCreateGWorld(rect.width, rect.height, GetMask()->GetDepth() );
LockPixels(GetGWorldPixMap(mask)); LockPixels(GetGWorldPixMap(mask));
LockPixels(GetGWorldPixMap(submask)); LockPixels(GetGWorldPixMap(submask));
@@ -755,7 +755,33 @@ wxBitmap::wxBitmap(const wxImage& image, int depth)
destinationBase += ((**pixMap).rowBytes & 0x7fff); destinationBase += ((**pixMap).rowBytes & 0x7fff);
destination = (unsigned char*) destinationBase ; destination = (unsigned char*) destinationBase ;
} }
if ( image.HasMask() ) if ( image.HasAlpha() )
{
unsigned char *alpha = image.GetAlpha();
wxColour maskcolor(image.GetMaskRed(), image.GetMaskGreen(), image.GetMaskBlue());
RGBColor color ;
wxBitmap maskBitmap ;
maskBitmap.Create( width, height, 24);
LockPixels( GetGWorldPixMap( (GWorldPtr) maskBitmap.GetHBITMAP()) );
SetGWorld( (GWorldPtr) maskBitmap.GetHBITMAP(), NULL);
for (int y = 0; y < height; y++)
{
for (int x = 0; x < width; x++)
{
memset( &color , 255 - *alpha , sizeof( color ) );
SetCPixel(x,y, &color);
alpha += 1 ;
}
} // for height
SetGWorld( (GWorldPtr) GetHBITMAP(), NULL);
SetMask(new wxMask( maskBitmap ));
UnlockPixels( GetGWorldPixMap( (GWorldPtr) maskBitmap.GetHBITMAP()) );
}
else if ( image.HasMask() )
{ {
data = image.GetData(); data = image.GetData();
@@ -777,7 +803,7 @@ wxBitmap::wxBitmap(const wxImage& image, int depth)
SetCPixel(x,y, &white); SetCPixel(x,y, &white);
} }
else { else {
SetCPixel(x,y, &black); SetCPixel(x,y, &black);
} }
data += 3 ; data += 3 ;
} }
@@ -1122,10 +1148,8 @@ bool wxMask::Create(const wxBitmap& bitmap)
wxCHECK_MSG( bitmap.Ok(), false, wxT("Invalid bitmap")); wxCHECK_MSG( bitmap.Ok(), false, wxT("Invalid bitmap"));
wxCHECK_MSG(bitmap.GetDepth() == 1, false, m_depth = bitmap.GetDepth() ;
wxT("Cannot create mask from colour bitmap")); m_maskBitmap = wxMacCreateGWorld(bitmap.GetWidth(), bitmap.GetHeight(), bitmap.GetDepth() );
m_maskBitmap = wxMacCreateGWorld(bitmap.GetWidth(), bitmap.GetHeight(), 1);
Rect rect = { 0,0, bitmap.GetHeight(), bitmap.GetWidth() }; Rect rect = { 0,0, bitmap.GetHeight(), bitmap.GetWidth() };
LockPixels( GetGWorldPixMap( (GWorldPtr) m_maskBitmap) ); LockPixels( GetGWorldPixMap( (GWorldPtr) m_maskBitmap) );
@@ -1164,6 +1188,7 @@ bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
wxCHECK_MSG( bitmap.Ok(), false, wxT("Illigal bitmap")); wxCHECK_MSG( bitmap.Ok(), false, wxT("Illigal bitmap"));
m_maskBitmap = wxMacCreateGWorld( bitmap.GetWidth() , bitmap.GetHeight() , 1 ); m_maskBitmap = wxMacCreateGWorld( bitmap.GetWidth() , bitmap.GetHeight() , 1 );
m_depth = 1 ;
LockPixels( GetGWorldPixMap( (GWorldPtr) m_maskBitmap ) ); LockPixels( GetGWorldPixMap( (GWorldPtr) m_maskBitmap ) );
LockPixels( GetGWorldPixMap( (GWorldPtr) bitmap.GetHBITMAP() ) ); LockPixels( GetGWorldPixMap( (GWorldPtr) bitmap.GetHBITMAP() ) );
RGBColor maskColor = MAC_WXCOLORREF(colour.GetPixel()); RGBColor maskColor = MAC_WXCOLORREF(colour.GetPixel());