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

Added support for static (inlined) wxImages with

Browse Source 
alpha channel.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30835 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling 2004-12-01 21:33:38 +00:00
parent 41b81aed52
commit 4ea56379e3
2 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/image.h
View File

@ -139,6 +139,7 @@ public:
wxImage(){}
wxImage( int width, int height, bool clear = true );
wxImage( int width, int height, unsigned char* data, bool static_data = false );
wxImage( int width, int height, unsigned char* data, unsigned char* alpha, bool static_data = false );
wxImage( const wxString& name, long type = wxBITMAP_TYPE_ANY, int index = -1 );
wxImage( const wxString& name, const wxString& mimetype, int index = -1 );
@ -152,6 +153,7 @@ public:
bool Create( int width, int height, bool clear = true );
bool Create( int width, int height, unsigned char* data, bool static_data = false );
bool Create( int width, int height, unsigned char* data, unsigned char* alpha, bool static_data = false );
void Destroy();
// creates an identical copy of the image (the = operator

30
src/common/image.cpp
View File

@ -94,10 +94,11 @@ wxImageRefData::wxImageRefData()
wxImageRefData::~wxImageRefData()
{
if ( !m_static )
if (!m_static)
{
free( m_data );
free(m_alpha);
free( m_alpha );
}
}
wxList wxImage::sm_handlers;
@ -120,6 +121,11 @@ wxImage::wxImage( int width, int height, unsigned char* data, bool static_data )
Create( width, height, data, static_data );
}
wxImage::wxImage( int width, int height, unsigned char* data, unsigned char* alpha, bool static_data )
{
Create( width, height, data, alpha, static_data );
}
wxImage::wxImage( const wxString& name, long type, int index )
{
LoadFile( name, type, index );
@ -193,6 +199,24 @@ bool wxImage::Create( int width, int height, unsigned char* data, bool static_da
return true;
}
bool wxImage::Create( int width, int height, unsigned char* data, unsigned char* alpha, bool static_data )
{
UnRef();
wxCHECK_MSG( data, false, _T("NULL data in wxImage::Create") );
m_refData = new wxImageRefData();
M_IMGDATA->m_data = data;
M_IMGDATA->m_alpha = alpha;
M_IMGDATA->m_width = width;
M_IMGDATA->m_height = height;
M_IMGDATA->m_ok = true;
M_IMGDATA->m_static = static_data;
return true;
}
void wxImage::Destroy()
{
UnRef();