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

some cleanup, and plug a few small holes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41675 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2006-10-07 18:32:11 +00:00
parent 314cd032db
commit 2365667381
2 changed files with 77 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/wx/gtk/bitmap.h
View File

@@ -50,16 +50,15 @@ private:
class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase
{ {
public: public:
wxBitmap(); wxBitmap() { }
wxBitmap( int width, int height, int depth = -1 ); wxBitmap( int width, int height, int depth = -1 );
wxBitmap( const char bits[], int width, int height, int depth = 1 ); wxBitmap( const char bits[], int width, int height, int depth = 1 );
wxBitmap( const char **bits ) { (void)CreateFromXpm(bits); } wxBitmap( const char* const* bits ) { CreateFromXpm(bits); }
wxBitmap( char **bits ) { (void)CreateFromXpm((const char **)bits); }
wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM ); wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM );
wxBitmap( const wxImage& image, int depth = -1 ) { (void)CreateFromImage(image, depth); } wxBitmap( const wxImage& image, int depth = -1 ) { (void)CreateFromImage(image, depth); }
virtual ~wxBitmap(); virtual ~wxBitmap();
bool operator == ( const wxBitmap& bmp ) const; bool operator == ( const wxBitmap& bmp ) const;
bool operator != ( const wxBitmap& bmp ) const; bool operator != ( const wxBitmap& bmp ) const { return !(*this == bmp); }
bool Ok() const; bool Ok() const;
bool Create(int width, int height, int depth = -1); bool Create(int width, int height, int depth = -1);
@@ -97,7 +96,7 @@ public:
void SetWidth( int width ); void SetWidth( int width );
void SetDepth( int depth ); void SetDepth( int depth );
void SetPixmap( GdkPixmap *pixmap ); void SetPixmap( GdkPixmap *pixmap );
void SetPixbuf(GdkPixbuf *pixbuf); void SetPixbuf(GdkPixbuf* pixbuf, int depth = 0);
GdkPixmap *GetPixmap() const; GdkPixmap *GetPixmap() const;
bool HasPixmap() const; bool HasPixmap() const;
@@ -105,7 +104,7 @@ public:
GdkPixbuf *GetPixbuf() const; GdkPixbuf *GetPixbuf() const;
// Basically, this corresponds to Win32 StretchBlt() // Basically, this corresponds to Win32 StretchBlt()
wxBitmap Rescale( int clipx, int clipy, int clipwidth, int clipheight, int width, int height ); wxBitmap Rescale(int clipx, int clipy, int clipwidth, int clipheight, int width, int height) const;
// raw bitmap access support functions // raw bitmap access support functions
void *GetRawData(wxPixelDataBase& data, int bpp); void *GetRawData(wxPixelDataBase& data, int bpp);
@@ -115,7 +114,7 @@ public:
void UseAlpha(); void UseAlpha();
protected: protected:
bool CreateFromXpm(const char **bits); bool CreateFromXpm(const char* const* bits);
bool CreateFromImage(const wxImage& image, int depth); bool CreateFromImage(const wxImage& image, int depth);
private: private:

146
src/gtk/bitmap.cpp
View File

@@ -193,7 +193,9 @@ public:
int m_width; int m_width;
int m_height; int m_height;
int m_bpp; int m_bpp;
#if wxUSE_PALETTE
wxPalette *m_palette; wxPalette *m_palette;
#endif // wxUSE_PALETTE
}; };
wxBitmapRefData::wxBitmapRefData() wxBitmapRefData::wxBitmapRefData()
@@ -204,7 +206,9 @@ wxBitmapRefData::wxBitmapRefData()
m_width = 0; m_width = 0;
m_height = 0; m_height = 0;
m_bpp = 0; m_bpp = 0;
#if wxUSE_PALETTE
m_palette = (wxPalette *) NULL; m_palette = (wxPalette *) NULL;
#endif // wxUSE_PALETTE
} }
wxBitmapRefData::~wxBitmapRefData() wxBitmapRefData::~wxBitmapRefData()
@@ -225,13 +229,29 @@ wxBitmapRefData::~wxBitmapRefData()
IMPLEMENT_DYNAMIC_CLASS(wxBitmap,wxGDIObject) IMPLEMENT_DYNAMIC_CLASS(wxBitmap,wxGDIObject)
wxBitmap::wxBitmap() wxBitmap::wxBitmap(int width, int height, int depth)
{ {
Create(width, height, depth);
} }
wxBitmap::wxBitmap( int width, int height, int depth ) wxBitmap::wxBitmap(const wxString &filename, wxBitmapType type)
{
LoadFile(filename, type);
}
wxBitmap::wxBitmap(const char bits[], int width, int height, int depth)
{
wxASSERT(depth == 1);
if (width > 0 && height > 0 && depth == 1)
{
SetPixmap(gdk_bitmap_create_from_data(wxGetRootWindow()->window, bits, width, height));
wxASSERT_MSG( M_BMPDATA->m_pixmap, wxT("couldn't create bitmap") );
}
}
wxBitmap::~wxBitmap()
{ {
Create( width, height, depth );
} }
bool wxBitmap::Create( int width, int height, int depth ) bool wxBitmap::Create( int width, int height, int depth )
@@ -245,8 +265,7 @@ bool wxBitmap::Create( int width, int height, int depth )
if (depth == 32) if (depth == 32)
{ {
SetPixbuf(gdk_pixbuf_new(GDK_COLORSPACE_RGB, true, 8, width, height)); SetPixbuf(gdk_pixbuf_new(GDK_COLORSPACE_RGB, true, 8, width, height), 32);
M_BMPDATA->m_bpp = 32;
} }
else else
{ {
@@ -265,14 +284,14 @@ bool wxBitmap::Create( int width, int height, int depth )
return Ok(); return Ok();
} }
bool wxBitmap::CreateFromXpm( const char **bits ) bool wxBitmap::CreateFromXpm(const char* const* bits)
{ {
UnRef(); UnRef();
wxCHECK_MSG( bits != NULL, false, wxT("invalid bitmap data") ); wxCHECK_MSG( bits != NULL, false, wxT("invalid bitmap data") );
GdkBitmap *mask = (GdkBitmap*) NULL; GdkBitmap *mask = (GdkBitmap*) NULL;
SetPixmap(gdk_pixmap_create_from_xpm_d(wxGetRootWindow()->window, &mask, NULL, (gchar**)bits)); SetPixmap(gdk_pixmap_create_from_xpm_d(wxGetRootWindow()->window, &mask, NULL, wx_const_cast(char**, bits)));
wxCHECK_MSG( M_BMPDATA->m_pixmap, false, wxT("couldn't create pixmap") ); wxCHECK_MSG( M_BMPDATA->m_pixmap, false, wxT("couldn't create pixmap") );
@@ -285,7 +304,7 @@ bool wxBitmap::CreateFromXpm( const char **bits )
return true; return true;
} }
wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight, int newx, int newy ) wxBitmap wxBitmap::Rescale(int clipx, int clipy, int clipwidth, int clipheight, int newx, int newy) const
{ {
wxBitmap bmp; wxBitmap bmp;
@@ -303,11 +322,10 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight,
if (M_BMPDATA->m_pixbuf != NULL && ( if (M_BMPDATA->m_pixbuf != NULL && (
M_BMPDATA->m_mask == NULL || gdk_pixbuf_get_has_alpha(M_BMPDATA->m_pixbuf))) M_BMPDATA->m_mask == NULL || gdk_pixbuf_get_has_alpha(M_BMPDATA->m_pixbuf)))
{ {
bmp.SetDepth(GetDepth());
bmp.SetPixbuf(gdk_pixbuf_new(GDK_COLORSPACE_RGB, bmp.SetPixbuf(gdk_pixbuf_new(GDK_COLORSPACE_RGB,
gdk_pixbuf_get_has_alpha(GetPixbuf()), gdk_pixbuf_get_has_alpha(M_BMPDATA->m_pixbuf),
8, width, height)); 8, width, height), M_BMPDATA->m_bpp);
gdk_pixbuf_scale(GetPixbuf(), bmp.GetPixbuf(), gdk_pixbuf_scale(M_BMPDATA->m_pixbuf, bmp.GetPixbuf(),
0, 0, width, height, 0, 0, width, height,
clipx, clipy, clipx, clipy,
(double)newx/GetWidth(), (double)newy/GetHeight(), (double)newx/GetWidth(), (double)newy/GetHeight(),
@@ -315,7 +333,8 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight,
} }
else else
{ {
GdkImage* img = gdk_drawable_get_image(GetPixmap(), 0, 0, GetWidth(), GetHeight()); GdkImage* img = gdk_drawable_get_image(
M_BMPDATA->m_pixmap, 0, 0, M_BMPDATA->m_width, M_BMPDATA->m_height);
wxCHECK_MSG(img, bmp, wxT("couldn't create image")); wxCHECK_MSG(img, bmp, wxT("couldn't create image"));
@@ -326,11 +345,7 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight,
if (GetDepth() != 1) if (GetDepth() != 1)
{ {
GdkVisual *visual = gdk_drawable_get_visual( GetPixmap() ); bmp.Create(width, height, gdk_drawable_get_depth(M_BMPDATA->m_pixmap));
if (visual == NULL)
visual = wxTheApp->GetGdkVisual();
bmp = wxBitmap(width, height, visual->depth);
dstpix = bmp.GetPixmap(); dstpix = bmp.GetPixmap();
gc = gdk_gc_new( dstpix ); gc = gdk_gc_new( dstpix );
} }
@@ -407,7 +422,7 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight,
if ( dst ) if ( dst )
{ {
bmp = wxBitmap( (const char *)dst, width, height, 1 ); bmp = wxBitmap(dst, width, height, 1);
free( dst ); free( dst );
} }
@@ -572,24 +587,19 @@ bool wxBitmap::CreateFromImageAsPixbuf(const wxImage& image)
int width = image.GetWidth(); int width = image.GetWidth();
int height = image.GetHeight(); int height = image.GetHeight();
GdkPixbuf *pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, Create(width, height, 32);
true, GdkPixbuf* pixbuf = M_BMPDATA->m_pixbuf;
8 /* bits per sample */,
width, height);
if (!pixbuf) if (!pixbuf)
return false; return false;
SetDepth(32);
SetPixbuf(pixbuf);
// Copy the data: // Copy the data:
unsigned char *in = image.GetData(); const unsigned char* in = image.GetData();
unsigned char *out = gdk_pixbuf_get_pixels(pixbuf); unsigned char *out = gdk_pixbuf_get_pixels(pixbuf);
unsigned char *alpha = image.GetAlpha(); unsigned char *alpha = image.GetAlpha();
int rowinc = gdk_pixbuf_get_rowstride(pixbuf) - 4 * width; int rowpad = gdk_pixbuf_get_rowstride(pixbuf) - 4 * width;
for (int y = 0; y < height; y++, out += rowinc) for (int y = 0; y < height; y++, out += rowpad)
{ {
for (int x = 0; x < width; x++, alpha++, out += 4, in += 3) for (int x = 0; x < width; x++, alpha++, out += 4, in += 3)
{ {
@@ -605,13 +615,11 @@ bool wxBitmap::CreateFromImageAsPixbuf(const wxImage& image)
wxImage wxBitmap::ConvertToImage() const wxImage wxBitmap::ConvertToImage() const
{ {
wxImage image;
wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") ); wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") );
const int w = GetWidth(); const int w = GetWidth();
const int h = GetHeight(); const int h = GetHeight();
image.Create(w, h); wxImage image(w, h, false);
unsigned char *data = image.GetData(); unsigned char *data = image.GetData();
wxCHECK_MSG(data != NULL, wxNullImage, wxT("couldn't create image") ); wxCHECK_MSG(data != NULL, wxNullImage, wxT("couldn't create image") );
@@ -626,12 +634,12 @@ wxImage wxBitmap::ConvertToImage() const
image.SetAlpha(); image.SetAlpha();
alpha = image.GetAlpha(); alpha = image.GetAlpha();
} }
unsigned char *in = gdk_pixbuf_get_pixels(pixbuf); const unsigned char* in = gdk_pixbuf_get_pixels(pixbuf);
unsigned char *out = data; unsigned char *out = data;
const int inc = 3 + int(alpha != NULL); const int inc = 3 + int(alpha != NULL);
const int rowinc = gdk_pixbuf_get_rowstride(pixbuf) - inc * w; const int rowpad = gdk_pixbuf_get_rowstride(pixbuf) - inc * w;
for (int y = 0; y < h; y++, in += rowinc) for (int y = 0; y < h; y++, in += rowpad)
{ {
for (int x = 0; x < w; x++, in += inc, out += 3) for (int x = 0; x < w; x++, in += inc, out += 3)
{ {
@@ -670,8 +678,10 @@ wxImage wxBitmap::ConvertToImage() const
// convert mask, unless there is already alpha // convert mask, unless there is already alpha
if (GetMask() && !image.HasAlpha()) if (GetMask() && !image.HasAlpha())
{ {
// the colour used as transparent one in wxImage and the one it is // we hard code the mask colour for now but we could also make an
// replaced with when it really occurs in the bitmap // 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
const int MASK_RED = 1; const int MASK_RED = 1;
const int MASK_GREEN = 2; const int MASK_GREEN = 2;
const int MASK_BLUE = 3; const int MASK_BLUE = 3;
@@ -692,6 +702,8 @@ wxImage wxBitmap::ConvertToImage() const
} }
else if (data[0] == MASK_RED && data[1] == MASK_GREEN && data[2] == MASK_BLUE) else 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[2] = MASK_BLUE_REPLACEMENT;
} }
} }
@@ -702,35 +714,11 @@ wxImage wxBitmap::ConvertToImage() const
return image; return image;
} }
wxBitmap::wxBitmap( const wxString &filename, wxBitmapType type )
{
LoadFile( filename, type );
}
wxBitmap::wxBitmap( const char bits[], int width, int height, int WXUNUSED(depth))
{
if ( width > 0 && height > 0 )
{
SetPixmap(gdk_bitmap_create_from_data(wxGetRootWindow()->window, bits, width, height));
wxASSERT_MSG( M_BMPDATA->m_pixmap, wxT("couldn't create bitmap") );
}
}
wxBitmap::~wxBitmap()
{
}
bool wxBitmap::operator == ( const wxBitmap& bmp ) const bool wxBitmap::operator == ( const wxBitmap& bmp ) const
{ {
return m_refData == bmp.m_refData; return m_refData == bmp.m_refData;
} }
bool wxBitmap::operator != ( const wxBitmap& bmp ) const
{
return m_refData != bmp.m_refData;
}
bool wxBitmap::Ok() const bool wxBitmap::Ok() const
{ {
return (m_refData != NULL) && return (m_refData != NULL) &&
@@ -772,8 +760,7 @@ void wxBitmap::SetMask( wxMask *mask )
{ {
wxCHECK_RET( Ok(), wxT("invalid bitmap") ); wxCHECK_RET( Ok(), wxT("invalid bitmap") );
if (M_BMPDATA->m_mask) delete M_BMPDATA->m_mask; delete M_BMPDATA->m_mask;
M_BMPDATA->m_mask = mask; M_BMPDATA->m_mask = mask;
} }
@@ -787,25 +774,25 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
{ {
wxBitmap ret; wxBitmap ret;
wxCHECK_MSG( Ok() && wxCHECK_MSG(Ok(), ret, wxT("invalid bitmap"));
(rect.x >= 0) && (rect.y >= 0) && wxCHECK_MSG(rect.x >= 0 && rect.y >= 0 &&
(rect.x+rect.width <= M_BMPDATA->m_width) && (rect.y+rect.height <= M_BMPDATA->m_height), rect.x + rect.width <= M_BMPDATA->m_width &&
ret, wxT("invalid bitmap or bitmap region") ); rect.y + rect.height <= M_BMPDATA->m_height,
ret, wxT("invalid bitmap region"));
if (HasPixbuf()) if (HasPixbuf() || M_BMPDATA->m_bpp == 32)
{ {
GdkPixbuf *pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, GdkPixbuf *pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB,
gdk_pixbuf_get_has_alpha(GetPixbuf()), gdk_pixbuf_get_has_alpha(GetPixbuf()),
8, rect.width, rect.height); 8, rect.width, rect.height);
ret.SetPixbuf(pixbuf); ret.SetPixbuf(pixbuf, M_BMPDATA->m_bpp);
ret.SetDepth(M_BMPDATA->m_bpp);
gdk_pixbuf_copy_area(GetPixbuf(), gdk_pixbuf_copy_area(GetPixbuf(),
rect.x, rect.y, rect.width, rect.height, rect.x, rect.y, rect.width, rect.height,
pixbuf, 0, 0); pixbuf, 0, 0);
} }
else else
{ {
ret = wxBitmap(rect.width, rect.height, M_BMPDATA->m_bpp); ret.Create(rect.width, rect.height, M_BMPDATA->m_bpp);
GdkGC *gc = gdk_gc_new( ret.GetPixmap() ); GdkGC *gc = gdk_gc_new( ret.GetPixmap() );
gdk_draw_drawable( ret.GetPixmap(), gc, GetPixmap(), rect.x, rect.y, 0, 0, rect.width, rect.height ); gdk_draw_drawable( ret.GetPixmap(), gc, GetPixmap(), rect.x, rect.y, 0, 0, rect.width, rect.height );
g_object_unref (gc); g_object_unref (gc);
@@ -854,7 +841,7 @@ bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type )
{ {
wxImage image; wxImage image;
if (image.LoadFile(name, type) && image.Ok()) if (image.LoadFile(name, type) && image.Ok())
*this = wxBitmap(image); CreateFromImage(image, -1);
} }
return Ok(); return Ok();
@@ -863,8 +850,7 @@ bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type )
#if wxUSE_PALETTE #if wxUSE_PALETTE
wxPalette *wxBitmap::GetPalette() const wxPalette *wxBitmap::GetPalette() const
{ {
if (!Ok()) wxCHECK_MSG(Ok(), NULL, wxT("invalid bitmap"));
return (wxPalette *) NULL;
return M_BMPDATA->m_palette; return M_BMPDATA->m_palette;
} }
@@ -929,7 +915,7 @@ GdkPixmap *wxBitmap::GetPixmap() const
gdk_pixbuf_render_pixmap_and_mask(M_BMPDATA->m_pixbuf, gdk_pixbuf_render_pixmap_and_mask(M_BMPDATA->m_pixbuf,
&M_BMPDATA->m_pixmap, &M_BMPDATA->m_pixmap,
pmask, pmask,
128 /*threshold*/); wxIMAGE_ALPHA_THRESHOLD);
} }
return M_BMPDATA->m_pixmap; return M_BMPDATA->m_pixmap;
@@ -954,7 +940,7 @@ GdkPixbuf *wxBitmap::GetPixbuf() const
GdkPixbuf *pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, GdkPixbuf *pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB,
GetMask() != NULL, GetMask() != NULL,
8, width, height); 8, width, height);
M_BMPDATA->m_pixbuf = M_BMPDATA->m_pixbuf = pixbuf;
gdk_pixbuf_get_from_drawable(pixbuf, M_BMPDATA->m_pixmap, NULL, gdk_pixbuf_get_from_drawable(pixbuf, M_BMPDATA->m_pixmap, NULL,
0, 0, 0, 0, width, height); 0, 0, 0, 0, width, height);
@@ -998,7 +984,7 @@ bool wxBitmap::HasPixbuf() const
return M_BMPDATA->m_pixbuf != NULL; return M_BMPDATA->m_pixbuf != NULL;
} }
void wxBitmap::SetPixbuf( GdkPixbuf *pixbuf ) void wxBitmap::SetPixbuf(GdkPixbuf* pixbuf, int depth)
{ {
if (!m_refData) if (!m_refData)
m_refData = new wxBitmapRefData; m_refData = new wxBitmapRefData;
@@ -1007,6 +993,12 @@ void wxBitmap::SetPixbuf( GdkPixbuf *pixbuf )
M_BMPDATA->m_pixbuf = pixbuf; M_BMPDATA->m_pixbuf = pixbuf;
M_BMPDATA->m_width = gdk_pixbuf_get_width(pixbuf); M_BMPDATA->m_width = gdk_pixbuf_get_width(pixbuf);
M_BMPDATA->m_height = gdk_pixbuf_get_height(pixbuf); M_BMPDATA->m_height = gdk_pixbuf_get_height(pixbuf);
// if depth specified
if (depth != 0)
M_BMPDATA->m_bpp = depth;
else if (M_BMPDATA->m_bpp == 0)
// use something reasonable
M_BMPDATA->m_bpp = wxTheApp->GetGdkVisual()->depth;
PurgeOtherRepresentations(Pixbuf); PurgeOtherRepresentations(Pixbuf);
} }