#include "wx/icon.h"
#include "wx/math.h"
#include "wx/image.h"
+ #include "wx/colour.h"
#endif
#include "wx/rawbmp.h"
// one bit per pixel, each row starts on a byte boundary
const size_t out_size = size_t((w + 7) / 8) * unsigned(h);
wxByte* out = new wxByte[out_size];
- // set bits are white
+ // set bits are unmasked
memset(out, 0xff, out_size);
unsigned bit_index = 0;
if (bitmap.HasPixbuf())
{
GdkImage* image = gdk_drawable_get_image(bitmap.GetPixmap(), 0, 0, w, h);
GdkColormap* colormap = gdk_image_get_colormap(image);
- guint32 mask_pixel = 1;
- if (colormap != NULL)
+ guint32 mask_pixel;
+ if (colormap == NULL)
+ // mono bitmap, white is pixel value 0
+ mask_pixel = guint32(colour.Red() != 255 || colour.Green() != 255 || colour.Blue() != 255);
+ else
{
wxColor c(colour);
c.CalcPixel(colormap);
{
public:
wxBitmapRefData();
- ~wxBitmapRefData();
+ virtual ~wxBitmapRefData();
GdkPixmap *m_pixmap;
GdkPixbuf *m_pixbuf;
int m_width;
int m_height;
int m_bpp;
+#if wxUSE_PALETTE
wxPalette *m_palette;
+#endif // wxUSE_PALETTE
};
wxBitmapRefData::wxBitmapRefData()
m_width = 0;
m_height = 0;
m_bpp = 0;
+#if wxUSE_PALETTE
m_palette = (wxPalette *) NULL;
+#endif // wxUSE_PALETTE
}
wxBitmapRefData::~wxBitmapRefData()
IMPLEMENT_DYNAMIC_CLASS(wxBitmap,wxGDIObject)
-wxBitmap::wxBitmap()
+wxBitmap::wxBitmap(int width, int height, int depth)
+{
+ Create(width, height, depth);
+}
+
+wxBitmap::wxBitmap(const wxString &filename, wxBitmapType type)
{
+ LoadFile(filename, type);
}
-wxBitmap::wxBitmap( int width, int height, int depth )
+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(const char* const* bits)
+{
+ wxCHECK2_MSG(bits != NULL, return, wxT("invalid bitmap data"));
+
+ GdkBitmap* mask = NULL;
+ SetPixmap(gdk_pixmap_create_from_xpm_d(wxGetRootWindow()->window, &mask, NULL, wx_const_cast(char**, bits)));
+
+ if (M_BMPDATA->m_pixmap != NULL && mask != NULL)
+ {
+ M_BMPDATA->m_mask = new wxMask;
+ M_BMPDATA->m_mask->m_bitmap = mask;
+ }
+}
+
+wxBitmap::~wxBitmap()
{
- Create( width, height, depth );
}
bool wxBitmap::Create( int width, int height, int depth )
if (depth == 32)
{
- SetPixbuf(gdk_pixbuf_new(GDK_COLORSPACE_RGB, true, 8, width, height));
- M_BMPDATA->m_bpp = 32;
+ SetPixbuf(gdk_pixbuf_new(GDK_COLORSPACE_RGB, true, 8, width, height), 32);
}
else
{
return Ok();
}
-bool wxBitmap::CreateFromXpm( const char **bits )
-{
- UnRef();
-
- wxCHECK_MSG( bits != NULL, false, wxT("invalid bitmap data") );
-
- GdkBitmap *mask = (GdkBitmap*) NULL;
- SetPixmap(gdk_pixmap_create_from_xpm_d(wxGetRootWindow()->window, &mask, NULL, (gchar**)bits));
-
- wxCHECK_MSG( M_BMPDATA->m_pixmap, false, wxT("couldn't create pixmap") );
-
- if (mask)
- {
- M_BMPDATA->m_mask = new wxMask;
- M_BMPDATA->m_mask->m_bitmap = mask;
- }
-
- 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;
width = wxMin(width, clipwidth);
height = wxMin(height, clipheight);
- if (HasPixbuf())
+ // scale pixbuf if available and it has alpha or there is no mask
+ if (M_BMPDATA->m_pixbuf != NULL && (
+ 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,
- true, //gdk_pixbuf_get_has_alpha(GetPixbuf()),
- 8, width, height));
- gdk_pixbuf_scale(GetPixbuf(), bmp.GetPixbuf(),
+ gdk_pixbuf_get_has_alpha(M_BMPDATA->m_pixbuf),
+ 8, width, height), M_BMPDATA->m_bpp);
+ gdk_pixbuf_scale(M_BMPDATA->m_pixbuf, bmp.GetPixbuf(),
0, 0, width, height,
clipx, clipy,
(double)newx/GetWidth(), (double)newy/GetHeight(),
}
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"));
if (GetDepth() != 1)
{
- GdkVisual *visual = gdk_drawable_get_visual( GetPixmap() );
- if (visual == NULL)
- visual = wxTheApp->GetGdkVisual();
-
- bmp = wxBitmap(width, height, visual->depth);
+ bmp.Create(width, height, gdk_drawable_get_depth(M_BMPDATA->m_pixmap));
dstpix = bmp.GetPixmap();
gc = gdk_gc_new( dstpix );
}
if ( dst )
{
- if (!pixval)
+ if (pixval)
{
char bit=1;
char shift = bit << (w % 8);
if ( dst )
{
- bmp = wxBitmap( (const char *)dst, width, height, 1 );
+ bmp = wxBitmap(dst, width, height, 1);
free( dst );
}
if (image.GetWidth() <= 0 || image.GetHeight() <= 0)
return false;
- if (depth == 1)
- return CreateFromImageAsPixmap(image, depth);
-
- if (image.HasAlpha())
+ // create pixbuf if image has alpha and requested depth is compatible
+ if (image.HasAlpha() && (depth == -1 || depth == 32))
return CreateFromImageAsPixbuf(image);
+ // otherwise create pixmap, if alpha is present it will be converted to mask
return CreateFromImageAsPixmap(image, depth);
}
// one bit per pixel, each row starts on a byte boundary
const size_t out_size = size_t((w + 7) / 8) * unsigned(h);
wxByte* out = new wxByte[out_size];
- // set bits are white
+ // set bits are black
memset(out, 0xff, out_size);
const wxByte* in = image.GetData();
unsigned bit_index = 0;
bool wxBitmap::CreateFromImageAsPixbuf(const wxImage& image)
{
+ wxASSERT(image.HasAlpha());
+
int width = image.GetWidth();
int height = image.GetHeight();
- GdkPixbuf *pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB,
- true, //image.HasAlpha(),
- 8 /* bits per sample */,
- width, height);
+ Create(width, height, 32);
+ GdkPixbuf* pixbuf = M_BMPDATA->m_pixbuf;
if (!pixbuf)
return false;
- wxASSERT( image.HasAlpha() ); // for now
- wxASSERT( gdk_pixbuf_get_n_channels(pixbuf) == 4 );
- wxASSERT( gdk_pixbuf_get_width(pixbuf) == width );
- wxASSERT( gdk_pixbuf_get_height(pixbuf) == height );
-
- SetDepth(wxTheApp->GetGdkVisual()->depth);
- SetPixbuf(pixbuf);
-
// Copy the data:
- unsigned char *in = image.GetData();
+ const unsigned char* in = image.GetData();
unsigned char *out = gdk_pixbuf_get_pixels(pixbuf);
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)
{
wxImage wxBitmap::ConvertToImage() const
{
- wxImage image;
-
wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") );
const int w = GetWidth();
const int h = GetHeight();
- image.Create(w, h);
+ wxImage image(w, h, false);
unsigned char *data = image.GetData();
wxCHECK_MSG(data != NULL, wxNullImage, wxT("couldn't create image") );
+ // prefer pixbuf if available, it will preserve alpha and should be quicker
if (HasPixbuf())
{
GdkPixbuf *pixbuf = GetPixbuf();
- wxASSERT( gdk_pixbuf_get_has_alpha(pixbuf) );
-
- image.SetAlpha();
-
- unsigned char *alpha = image.GetAlpha();
- unsigned char *in = gdk_pixbuf_get_pixels(pixbuf);
+ unsigned char* alpha = NULL;
+ if (gdk_pixbuf_get_has_alpha(pixbuf))
+ {
+ image.SetAlpha();
+ alpha = image.GetAlpha();
+ }
+ const unsigned char* in = gdk_pixbuf_get_pixels(pixbuf);
unsigned char *out = data;
- int rowinc = gdk_pixbuf_get_rowstride(pixbuf) - 4 * w;
+ const int inc = 3 + int(alpha != NULL);
+ 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 += 4, out += 3, alpha++)
+ for (int x = 0; x < w; x++, in += inc, out += 3)
{
out[0] = in[0];
out[1] = in[1];
out[2] = in[2];
- *alpha = in[3];
+ if (alpha != NULL)
+ *alpha++ = in[3];
}
}
}
GdkPixmap* pixmap_invert = NULL;
if (GetDepth() == 1)
{
- // mono bitmaps are inverted
+ // mono bitmaps are inverted, i.e. 0 is white
pixmap_invert = gdk_pixmap_new(pixmap, w, h, 1);
GdkGC* gc = gdk_gc_new(pixmap_invert);
gdk_gc_set_function(gc, GDK_COPY_INVERT);
g_object_unref(pixbuf);
if (pixmap_invert != NULL)
g_object_unref(pixmap_invert);
+ }
+ // convert mask, unless there is already alpha
+ if (GetMask() && !image.HasAlpha())
+ {
+ // 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
+ const int MASK_RED = 1;
+ const int MASK_GREEN = 2;
+ const int MASK_BLUE = 3;
+ const int MASK_BLUE_REPLACEMENT = 2;
+
+ image.SetMaskColour(MASK_RED, MASK_GREEN, MASK_BLUE);
+ GdkImage* image_mask = gdk_drawable_get_image(GetMask()->GetBitmap(), 0, 0, w, h);
- if (GetMask())
+ for (int y = 0; y < h; y++)
{
- // the colour used as transparent one in wxImage and the one it is
- // replaced with when it really occurs in the bitmap
- const int MASK_RED = 1;
- const int MASK_GREEN = 2;
- const int MASK_BLUE = 3;
- const int MASK_BLUE_REPLACEMENT = 2;
-
- image.SetMaskColour(MASK_RED, MASK_GREEN, MASK_BLUE);
- GdkImage* image_mask = gdk_drawable_get_image(GetMask()->GetBitmap(), 0, 0, w, h);
-
- for (int y = 0; y < h; y++)
+ for (int x = 0; x < w; x++, data += 3)
{
- for (int x = 0; x < w; x++, data += 3)
+ if (gdk_image_get_pixel(image_mask, x, y) == 0)
{
- if (gdk_image_get_pixel(image_mask, x, y) == 0)
- {
- 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)
- {
- data[2] = MASK_BLUE_REPLACEMENT;
- }
+ 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;
}
}
- g_object_unref(image_mask);
}
+ g_object_unref(image_mask);
}
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
{
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::IsOk() const
{
return (m_refData != NULL) &&
(
{
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;
}
{
wxBitmap ret;
- wxCHECK_MSG( Ok() &&
- (rect.x >= 0) && (rect.y >= 0) &&
- (rect.x+rect.width <= M_BMPDATA->m_width) && (rect.y+rect.height <= M_BMPDATA->m_height),
- ret, wxT("invalid bitmap or bitmap region") );
+ wxCHECK_MSG(Ok(), ret, wxT("invalid bitmap"));
+ wxCHECK_MSG(rect.x >= 0 && rect.y >= 0 &&
+ rect.x + rect.width <= M_BMPDATA->m_width &&
+ 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,
- true, //gdk_pixbuf_get_has_alpha(GetPixbuf()),
+ gdk_pixbuf_get_has_alpha(GetPixbuf()),
8, rect.width, rect.height);
- ret.SetPixbuf(pixbuf);
- ret.SetDepth(M_BMPDATA->m_bpp);
+ ret.SetPixbuf(pixbuf, M_BMPDATA->m_bpp);
gdk_pixbuf_copy_area(GetPixbuf(),
rect.x, rect.y, rect.width, rect.height,
pixbuf, 0, 0);
}
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() );
gdk_draw_drawable( ret.GetPixmap(), gc, GetPixmap(), rect.x, rect.y, 0, 0, rect.width, rect.height );
g_object_unref (gc);
}
-
- if (GetMask())
+ // make mask, unless there is already alpha
+ if (GetMask() && !HasAlpha())
{
wxMask *mask = new wxMask;
mask->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, rect.width, rect.height, 1 );
{
wxImage image;
if (image.LoadFile(name, type) && image.Ok())
- *this = wxBitmap(image);
+ CreateFromImage(image, -1);
}
return Ok();
#if wxUSE_PALETTE
wxPalette *wxBitmap::GetPalette() const
{
- if (!Ok())
- return (wxPalette *) NULL;
+ wxCHECK_MSG(Ok(), NULL, wxT("invalid bitmap"));
return M_BMPDATA->m_palette;
}
// create the pixmap on the fly if we use Pixbuf representation:
if (M_BMPDATA->m_pixmap == NULL)
{
- delete M_BMPDATA->m_mask;
- M_BMPDATA->m_mask = new wxMask;
+ GdkPixmap** pmask = NULL;
+ if (gdk_pixbuf_get_has_alpha(M_BMPDATA->m_pixbuf))
+ {
+ // make new mask from alpha
+ delete M_BMPDATA->m_mask;
+ M_BMPDATA->m_mask = new wxMask;
+ pmask = &M_BMPDATA->m_mask->m_bitmap;
+ }
gdk_pixbuf_render_pixmap_and_mask(M_BMPDATA->m_pixbuf,
&M_BMPDATA->m_pixmap,
- &M_BMPDATA->m_mask->m_bitmap,
- 128 /*threshold*/);
+ pmask,
+ wxIMAGE_ALPHA_THRESHOLD);
}
return M_BMPDATA->m_pixmap;
int width = GetWidth();
int height = GetHeight();
- // always create the alpha channel so raw bitmap access will work
- // correctly
GdkPixbuf *pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB,
- true, // GetMask() != NULL,
+ GetMask() != NULL,
8, width, height);
- M_BMPDATA->m_pixbuf =
- gdk_pixbuf_get_from_drawable(pixbuf, M_BMPDATA->m_pixmap, NULL,
- 0, 0, 0, 0, width, height);
+ M_BMPDATA->m_pixbuf = pixbuf;
+ gdk_pixbuf_get_from_drawable(pixbuf, M_BMPDATA->m_pixmap, NULL,
+ 0, 0, 0, 0, width, height);
// apply the mask to created pixbuf:
if (M_BMPDATA->m_pixbuf && M_BMPDATA->m_mask)
return M_BMPDATA->m_pixbuf != NULL;
}
-void wxBitmap::SetPixbuf( GdkPixbuf *pixbuf )
+void wxBitmap::SetPixbuf(GdkPixbuf* pixbuf, int depth)
{
if (!m_refData)
m_refData = new wxBitmapRefData;
M_BMPDATA->m_pixbuf = pixbuf;
M_BMPDATA->m_width = gdk_pixbuf_get_width(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);
}
void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)
{
- if (bpp != 32)
- return NULL;
-
+ void* bits = NULL;
GdkPixbuf *pixbuf = GetPixbuf();
- if (!pixbuf)
- return NULL;
-
- if (!gdk_pixbuf_get_has_alpha( pixbuf ))
- return NULL;
-
-#if 0
- if (gdk_pixbuf_get_has_alpha( pixbuf ))
- wxPrintf( wxT("Has alpha, %d channels\n"), gdk_pixbuf_get_n_channels(pixbuf) );
- else
- wxPrintf( wxT("No alpha, %d channels.\n"), gdk_pixbuf_get_n_channels(pixbuf) );
-#endif
-
- data.m_height = gdk_pixbuf_get_height( pixbuf );
- data.m_width = gdk_pixbuf_get_width( pixbuf );
- data.m_stride = gdk_pixbuf_get_rowstride( pixbuf );
-
- return gdk_pixbuf_get_pixels( pixbuf );
+ const bool hasAlpha = HasAlpha();
+ // allow access if bpp is valid and matches existence of alpha
+ if (pixbuf != NULL && (
+ bpp == 24 && !hasAlpha ||
+ bpp == 32 && hasAlpha))
+ {
+ data.m_height = gdk_pixbuf_get_height( pixbuf );
+ data.m_width = gdk_pixbuf_get_width( pixbuf );
+ data.m_stride = gdk_pixbuf_get_rowstride( pixbuf );
+ bits = gdk_pixbuf_get_pixels(pixbuf);
+ }
+ return bits;
}
void wxBitmap::UngetRawData(wxPixelDataBase& WXUNUSED(data))
{
}
-
bool wxBitmap::HasAlpha() const
{
- return HasPixbuf();
+ return m_refData != NULL && M_BMPDATA->m_pixbuf != NULL &&
+ gdk_pixbuf_get_has_alpha(M_BMPDATA->m_pixbuf);
}
void wxBitmap::UseAlpha()
{
- GetPixbuf();
+ GdkPixbuf* pixbuf = GetPixbuf();
+ // add alpha if necessary
+ if (!gdk_pixbuf_get_has_alpha(pixbuf))
+ {
+ M_BMPDATA->m_pixbuf = NULL;
+ SetPixbuf(gdk_pixbuf_add_alpha(pixbuf, false, 0, 0, 0));
+ g_object_unref(pixbuf);
+ }
}
//-----------------------------------------------------------------------------
// wxBitmapHandler
//-----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler,wxBitmapHandlerBase)
-
-wxBitmapHandler::~wxBitmapHandler()
-{
-}
-
-bool wxBitmapHandler::Create(wxBitmap * WXUNUSED(bitmap),
- void * WXUNUSED(data),
- long WXUNUSED(type),
- int WXUNUSED(width),
- int WXUNUSED(height),
- int WXUNUSED(depth))
-{
- wxFAIL_MSG( _T("not implemented") );
-
- return false;
-}
-
-bool wxBitmapHandler::LoadFile(wxBitmap * WXUNUSED(bitmap),
- const wxString& WXUNUSED(name),
- long WXUNUSED(flags),
- int WXUNUSED(desiredWidth),
- int WXUNUSED(desiredHeight))
-{
- wxFAIL_MSG( _T("not implemented") );
-
- return false;
-}
-
-bool wxBitmapHandler::SaveFile(const wxBitmap * WXUNUSED(bitmap),
- const wxString& WXUNUSED(name),
- int WXUNUSED(type),
- const wxPalette * WXUNUSED(palette))
-{
- wxFAIL_MSG( _T("not implemented") );
-
- return false;
-}
+IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandler, wxBitmapHandlerBase)
/* static */ void wxBitmap::InitStandardHandlers()
{
projects / wxWidgets.git / blobdiff