#include "wx/icon.h"
#include "wx/math.h"
#include "wx/image.h"
+ #include "wx/colour.h"
#endif
#include "wx/rawbmp.h"
#include <gtk/gtk.h>
-extern void gdk_wx_draw_bitmap (GdkDrawable *drawable,
- GdkGC *gc,
- GdkDrawable *src,
- gint xsrc,
- gint ysrc,
- gint xdest,
- gint ydest,
- gint width,
- gint height);
-
//-----------------------------------------------------------------------------
// data
//-----------------------------------------------------------------------------
m_bitmap = (GdkBitmap*) NULL;
}
- wxImage image = bitmap.ConvertToImage();
- if (!image.Ok()) return false;
-
- m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, image.GetWidth(), image.GetHeight(), 1 );
- GdkGC *gc = gdk_gc_new( m_bitmap );
-
- GdkColor color;
- color.pixel = 1;
- gdk_gc_set_foreground( gc, &color );
- gdk_draw_rectangle( m_bitmap, gc, TRUE, 0, 0, image.GetWidth(), image.GetHeight() );
+ const int w = bitmap.GetWidth();
+ const int h = bitmap.GetHeight();
- unsigned char *data = image.GetData();
- int index = 0;
-
- unsigned char red = colour.Red();
- unsigned char green = colour.Green();
- unsigned char blue = colour.Blue();
+ // create mask as XBM format bitmap
- GdkVisual *visual = wxTheApp->GetGdkVisual();
-
- int bpp = visual->depth;
- if ((bpp == 16) && (visual->red_mask != 0xf800))
- bpp = 15;
- if (bpp == 15)
- {
- red = red & 0xf8;
- green = green & 0xf8;
- blue = blue & 0xf8;
- }
- else if (bpp == 16)
- {
- red = red & 0xf8;
- green = green & 0xfc;
- blue = blue & 0xf8;
- }
- else if (bpp == 12)
+ // 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 unmasked
+ memset(out, 0xff, out_size);
+ unsigned bit_index = 0;
+ if (bitmap.HasPixbuf())
{
- red = red & 0xf0;
- green = green & 0xf0;
- blue = blue & 0xf0;
+ const wxByte r_mask = colour.Red();
+ const wxByte g_mask = colour.Green();
+ const wxByte b_mask = colour.Blue();
+ GdkPixbuf* pixbuf = bitmap.GetPixbuf();
+ const wxByte* in = gdk_pixbuf_get_pixels(pixbuf);
+ const int inc = 3 + int(gdk_pixbuf_get_has_alpha(pixbuf) != 0);
+ const int rowpadding = gdk_pixbuf_get_rowstride(pixbuf) - inc * w;
+ for (int y = 0; y < h; y++, in += rowpadding)
+ {
+ for (int x = 0; x < w; x++, in += inc, bit_index++)
+ if (in[0] == r_mask && in[1] == g_mask && in[2] == b_mask)
+ out[bit_index >> 3] ^= 1 << (bit_index & 7);
+ // move index to next byte boundary
+ bit_index = (bit_index + 7) & ~7u;
+ }
}
-
- color.pixel = 0;
- gdk_gc_set_foreground( gc, &color );
-
- for (int j = 0; j < image.GetHeight(); j++)
+ else
{
- int start_x = -1;
- int i;
- for (i = 0; i < image.GetWidth(); i++)
+ GdkImage* image = gdk_drawable_get_image(bitmap.GetPixmap(), 0, 0, w, h);
+ GdkColormap* colormap = gdk_image_get_colormap(image);
+ 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
{
- if ((data[index] == red) &&
- (data[index+1] == green) &&
- (data[index+2] == blue))
- {
- if (start_x == -1)
- start_x = i;
- }
- else
- {
- if (start_x != -1)
- {
- gdk_draw_line( m_bitmap, gc, start_x, j, i-1, j );
- start_x = -1;
- }
- }
- index += 3;
+ wxColor c(colour);
+ c.CalcPixel(colormap);
+ mask_pixel = c.GetPixel();
}
- if (start_x != -1)
- gdk_draw_line( m_bitmap, gc, start_x, j, i, j );
+ for (int y = 0; y < h; y++)
+ {
+ for (int x = 0; x < w; x++, bit_index++)
+ if (gdk_image_get_pixel(image, x, y) == mask_pixel)
+ out[bit_index >> 3] ^= 1 << (bit_index & 7);
+ bit_index = (bit_index + 7) & ~7u;
+ }
+ g_object_unref(image);
}
-
- g_object_unref (gc);
-
+ m_bitmap = gdk_bitmap_create_from_data(wxGetRootWindow()->window, (char*)out, w, h);
+ delete[] out;
return true;
}
if (!m_bitmap) return false;
GdkGC *gc = gdk_gc_new( m_bitmap );
-
- gdk_wx_draw_bitmap( m_bitmap, gc, bitmap.GetPixmap(), 0, 0, 0, 0, bitmap.GetWidth(), bitmap.GetHeight() );
-
+ gdk_gc_set_function(gc, GDK_COPY_INVERT);
+ gdk_draw_drawable(m_bitmap, gc, bitmap.GetPixmap(), 0, 0, 0, 0, bitmap.GetWidth(), bitmap.GetHeight());
g_object_unref (gc);
return true;
{
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,
- 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_image_get(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 );
}
{
dstbyteperline = (width + 7) / 8;
dst = (char*) malloc(dstbyteperline*height);
- img = gdk_image_get( GetMask()->GetBitmap(), 0, 0, GetWidth(), GetHeight() );
+ img = gdk_drawable_get_image(GetMask()->GetBitmap(), 0, 0, GetWidth(), GetHeight());
for (int h = 0; h < height; h++)
{
if (image.GetWidth() <= 0 || image.GetHeight() <= 0)
return false;
- if (depth == 1)
- return CreateFromImageAsBitmap(image);
-
- if (image.HasAlpha())
+ // create pixbuf if image has alpha and requested depth is compatible
+ if (image.HasAlpha() && (depth == -1 || depth == 32))
return CreateFromImageAsPixbuf(image);
- return CreateFromImageAsPixmap(image);
+ // otherwise create pixmap, if alpha is present it will be converted to mask
+ return CreateFromImageAsPixmap(image, depth);
}
-// conversion to mono bitmap:
-bool wxBitmap::CreateFromImageAsBitmap(const wxImage& img)
+bool wxBitmap::CreateFromImageAsPixmap(const wxImage& image, int depth)
{
- // convert alpha channel to mask, if it is present:
- wxImage image(img);
- image.ConvertAlphaToMask();
-
- int width = image.GetWidth();
- int height = image.GetHeight();
-
- SetPixmap( gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 ) );
-
- // Create picture image
-
- GdkGC* data_gc = gdk_gc_new(M_BMPDATA->m_pixmap);
- GdkColor color;
- color.pixel = 1;
- gdk_gc_set_foreground(data_gc, &color);
- gdk_draw_rectangle(M_BMPDATA->m_pixmap, data_gc, true, 0, 0, width, height);
- GdkImage* data_image = gdk_drawable_get_image(M_BMPDATA->m_pixmap, 0, 0, width, height);
-
- // Create mask image
-
- GdkImage *mask_image = (GdkImage*) NULL;
- GdkGC* mask_gc = NULL;
-
- if (image.HasMask())
+ const int w = image.GetWidth();
+ const int h = image.GetHeight();
+ if (depth == 1)
{
- wxMask* mask = new wxMask;
- mask->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 );
- mask_gc = gdk_gc_new(mask->m_bitmap);
- gdk_gc_set_foreground(mask_gc, &color);
- gdk_draw_rectangle(mask->m_bitmap, mask_gc, true, 0, 0, width, height);
- mask_image = gdk_drawable_get_image(mask->m_bitmap, 0, 0, width, height);
-
- SetMask( mask );
+ // create XBM format bitmap
+
+ // 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 black
+ memset(out, 0xff, out_size);
+ const wxByte* in = image.GetData();
+ unsigned bit_index = 0;
+ for (int y = 0; y < h; y++)
+ {
+ for (int x = 0; x < w; x++, in += 3, bit_index++)
+ if (in[0] == 255 && in[1] == 255 && in[2] == 255)
+ out[bit_index >> 3] ^= 1 << (bit_index & 7);
+ // move index to next byte boundary
+ bit_index = (bit_index + 7) & ~7u;
+ }
+ SetPixmap(gdk_bitmap_create_from_data(wxGetRootWindow()->window, (char*)out, w, h));
+ delete[] out;
+ }
+ else
+ {
+ SetPixmap(gdk_pixmap_new(wxGetRootWindow()->window, w, h, depth));
+ GdkGC* gc = gdk_gc_new(M_BMPDATA->m_pixmap);
+ gdk_draw_rgb_image(
+ M_BMPDATA->m_pixmap, gc,
+ 0, 0, w, h,
+ GDK_RGB_DITHER_NONE, image.GetData(), w * 3);
+ g_object_unref(gc);
}
- int r_mask = image.GetMaskRed();
- int g_mask = image.GetMaskGreen();
- int b_mask = image.GetMaskBlue();
-
- unsigned char* data = image.GetData();
-
- int index = 0;
- for (int y = 0; y < height; y++)
+ const wxByte* alpha = image.GetAlpha();
+ if (alpha != NULL || image.HasMask())
{
- for (int x = 0; x < width; x++)
+ // create mask as XBM format bitmap
+
+ const size_t out_size = size_t((w + 7) / 8) * unsigned(h);
+ wxByte* out = new wxByte[out_size];
+ memset(out, 0xff, out_size);
+ unsigned bit_index = 0;
+ if (alpha != NULL)
{
- int r = data[index];
- index++;
- int g = data[index];
- index++;
- int b = data[index];
- index++;
-
- if (mask_image != NULL)
+ for (int y = 0; y < h; y++)
{
- if ((r == r_mask) && (b == b_mask) && (g == g_mask))
- gdk_image_put_pixel( mask_image, x, y, 0 );
+ for (int x = 0; x < w; x++, bit_index++)
+ if (*alpha++ < wxIMAGE_ALPHA_THRESHOLD)
+ out[bit_index >> 3] ^= 1 << (bit_index & 7);
+ bit_index = (bit_index + 7) & ~7u;
}
-
- if ((r == 255) && (b == 255) && (g == 255))
- gdk_image_put_pixel( data_image, x, y, 0 );
-
- } // for
- } // for
-
- // Blit picture
-
- gdk_draw_image( GetPixmap(), data_gc, data_image, 0, 0, 0, 0, width, height );
-
- g_object_unref (data_image);
- g_object_unref (data_gc);
-
- // Blit mask
-
- if (mask_image != NULL)
- {
- gdk_draw_image( GetMask()->GetBitmap(), mask_gc, mask_image, 0, 0, 0, 0, width, height );
-
- g_object_unref (mask_image);
- g_object_unref (mask_gc);
- }
-
- return true;
-}
-
-// conversion to colour bitmap:
-bool wxBitmap::CreateFromImageAsPixmap(const wxImage& image)
-{
- // alpha is handled by CreateFromImageAsPixbuf
- wxASSERT(!image.HasAlpha());
-
- int width = image.GetWidth();
- int height = image.GetHeight();
-
- SetPixmap( gdk_pixmap_new( wxGetRootWindow()->window, width, height, -1 ) );
-
- GdkGC *gc = gdk_gc_new( GetPixmap() );
-
- gdk_draw_rgb_image( GetPixmap(),
- gc,
- 0, 0,
- width, height,
- GDK_RGB_DITHER_NONE,
- image.GetData(),
- width*3 );
-
- g_object_unref (gc);
-
- // Create mask image
-
- if (!image.HasMask())
- return true;
-
- wxMask* mask = new wxMask;
- mask->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 );
- GdkGC* mask_gc = gdk_gc_new(mask->m_bitmap);
- GdkColor color;
- color.pixel = 1;
- gdk_gc_set_foreground(mask_gc, &color);
- gdk_draw_rectangle(mask->m_bitmap, mask_gc, true, 0, 0, width, height);
- GdkImage* mask_image = gdk_drawable_get_image(mask->m_bitmap, 0, 0, width, height);
-
- SetMask( mask );
-
- int r_mask = image.GetMaskRed();
- int g_mask = image.GetMaskGreen();
- int b_mask = image.GetMaskBlue();
-
- unsigned char* data = image.GetData();
-
- int index = 0;
- for (int y = 0; y < height; y++)
- {
- for (int x = 0; x < width; x++)
+ }
+ else
{
- int r = data[index];
- index++;
- int g = data[index];
- index++;
- int b = data[index];
- index++;
-
- if ((r == r_mask) && (b == b_mask) && (g == g_mask))
- gdk_image_put_pixel( mask_image, x, y, 0 );
- } // for
- } // for
-
- // Blit mask
-
- gdk_draw_image( GetMask()->GetBitmap(), mask_gc, mask_image, 0, 0, 0, 0, width, height );
-
- g_object_unref (mask_image);
- g_object_unref (mask_gc);
-
+ const wxByte r_mask = image.GetMaskRed();
+ const wxByte g_mask = image.GetMaskGreen();
+ const wxByte b_mask = image.GetMaskBlue();
+ const wxByte* in = image.GetData();
+ for (int y = 0; y < h; y++)
+ {
+ for (int x = 0; x < w; x++, in += 3, bit_index++)
+ if (in[0] == r_mask && in[1] == g_mask && in[2] == b_mask)
+ out[bit_index >> 3] ^= 1 << (bit_index & 7);
+ bit_index = (bit_index + 7) & ~7u;
+ }
+ }
+ wxMask* mask = new wxMask;
+ mask->m_bitmap = gdk_bitmap_create_from_data(M_BMPDATA->m_pixmap, (char*)out, w, h);
+ SetMask(mask);
+ delete[] out;
+ }
return true;
}
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,
- 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") );
- image.Create(GetWidth(), GetHeight());
+ const int w = GetWidth();
+ const int h = GetHeight();
+ 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) );
-
- int w = GetWidth();
- int h = GetHeight();
-
- 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];
}
}
}
else
{
- // the colour used as transparent one in wxImage and the one it is
- // replaced with when it really occurs in the bitmap
- static const int MASK_RED = 1;
- static const int MASK_GREEN = 2;
- static const int MASK_BLUE = 3;
- static const int MASK_BLUE_REPLACEMENT = 2;
-
- GdkImage *gdk_image = (GdkImage*) NULL;
-
- if (HasPixmap())
- {
- gdk_image = gdk_image_get( GetPixmap(),
- 0, 0,
- GetWidth(), GetHeight() );
- }
- else
- {
- wxFAIL_MSG( wxT("Ill-formed bitmap") );
- }
-
- wxCHECK_MSG( gdk_image, wxNullImage, wxT("couldn't create image") );
-
- GdkImage *gdk_image_mask = (GdkImage*) NULL;
- if (GetMask())
- {
- gdk_image_mask = gdk_image_get( GetMask()->GetBitmap(),
- 0, 0,
- GetWidth(), GetHeight() );
-
- image.SetMaskColour( MASK_RED, MASK_GREEN, MASK_BLUE );
- }
-
- int bpp = -1;
- int red_shift_right = 0;
- int green_shift_right = 0;
- int blue_shift_right = 0;
- int red_shift_left = 0;
- int green_shift_left = 0;
- int blue_shift_left = 0;
- bool use_shift = false;
-
- if (GetDepth() != 1)
- {
- GdkVisual *visual = gdk_drawable_get_visual( GetPixmap() );
- if (visual == NULL)
- visual = wxTheApp->GetGdkVisual();
-
- bpp = visual->depth;
- if (bpp == 16)
- bpp = visual->red_prec + visual->green_prec + visual->blue_prec;
- red_shift_right = visual->red_shift;
- red_shift_left = 8-visual->red_prec;
- green_shift_right = visual->green_shift;
- green_shift_left = 8-visual->green_prec;
- blue_shift_right = visual->blue_shift;
- blue_shift_left = 8-visual->blue_prec;
-
- use_shift = (visual->type == GDK_VISUAL_TRUE_COLOR) || (visual->type == GDK_VISUAL_DIRECT_COLOR);
- }
- else
+ GdkPixmap* pixmap = GetPixmap();
+ GdkPixmap* pixmap_invert = NULL;
+ if (GetDepth() == 1)
{
- bpp = 1;
+ // 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);
+ gdk_draw_drawable(pixmap_invert, gc, pixmap, 0, 0, 0, 0, w, h);
+ g_object_unref(gc);
+ pixmap = pixmap_invert;
}
+ // create a pixbuf which shares data with the wxImage
+ GdkPixbuf* pixbuf = gdk_pixbuf_new_from_data(
+ data, GDK_COLORSPACE_RGB, false, 8, w, h, 3 * w, NULL, NULL);
+ gdk_pixbuf_get_from_drawable(pixbuf, pixmap, NULL, 0, 0, 0, 0, w, h);
- GdkColormap *cmap = gtk_widget_get_default_colormap();
-
- long pos = 0;
- for (int j = 0; j < GetHeight(); j++)
+ 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);
+
+ for (int y = 0; y < h; y++)
{
- for (int i = 0; i < GetWidth(); i++)
+ for (int x = 0; x < w; x++, data += 3)
{
- wxUint32 pixel = gdk_image_get_pixel( gdk_image, i, j );
- if (bpp == 1)
+ if (gdk_image_get_pixel(image_mask, x, y) == 0)
{
- if (pixel == 0)
- {
- data[pos] = 0;
- data[pos+1] = 0;
- data[pos+2] = 0;
- }
- else
- {
- data[pos] = 255;
- data[pos+1] = 255;
- data[pos+2] = 255;
- }
+ data[0] = MASK_RED;
+ data[1] = MASK_GREEN;
+ data[2] = MASK_BLUE;
}
- else if (use_shift)
+ else if (data[0] == MASK_RED && data[1] == MASK_GREEN && data[2] == MASK_BLUE)
{
- data[pos] = (pixel >> red_shift_right) << red_shift_left;
- data[pos+1] = (pixel >> green_shift_right) << green_shift_left;
- data[pos+2] = (pixel >> blue_shift_right) << blue_shift_left;
- }
- else if (cmap->colors)
- {
- data[pos] = cmap->colors[pixel].red >> 8;
- data[pos+1] = cmap->colors[pixel].green >> 8;
- data[pos+2] = cmap->colors[pixel].blue >> 8;
- }
- else
- {
- wxFAIL_MSG( wxT("Image conversion failed. Unknown visual type.") );
- }
-
- if (gdk_image_mask)
- {
- int mask_pixel = gdk_image_get_pixel( gdk_image_mask, i, j );
- if (mask_pixel == 0)
- {
- data[pos] = MASK_RED;
- data[pos+1] = MASK_GREEN;
- data[pos+2] = MASK_BLUE;
- }
- else if ( data[pos] == MASK_RED &&
- data[pos+1] == MASK_GREEN &&
- data[pos+2] == MASK_BLUE )
- {
- data[pos+2] = MASK_BLUE_REPLACEMENT;
- }
+ // we have to fudge the colour a bit to prevent
+ // this pixel from appearing transparent
+ data[2] = MASK_BLUE_REPLACEMENT;
}
-
- pos += 3;
}
}
-
- g_object_unref (gdk_image);
- if (gdk_image_mask) g_object_unref (gdk_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,
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);
- if (M_BMPDATA->m_bpp != 1)
- {
- 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);
- }
- else
- {
- GdkGC *gc = gdk_gc_new( ret.GetPixmap() );
- GdkColor col;
- col.pixel = 0xFFFFFF;
- gdk_gc_set_foreground( gc, &col );
- col.pixel = 0;
- gdk_gc_set_background( gc, &col );
- gdk_wx_draw_bitmap( ret.GetPixmap(), gc, GetPixmap(), rect.x, rect.y, 0, 0, rect.width, rect.height );
- g_object_unref (gc);
- }
+ 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 );
GdkGC *gc = gdk_gc_new( mask->m_bitmap );
- GdkColor col;
- col.pixel = 0xFFFFFF;
- gdk_gc_set_foreground( gc, &col );
- col.pixel = 0;
- gdk_gc_set_background( gc, &col );
- gdk_wx_draw_bitmap( mask->m_bitmap, gc, M_BMPDATA->m_mask->m_bitmap, rect.x, rect.y, 0, 0, rect.width, rect.height );
+ gdk_draw_drawable(mask->m_bitmap, gc, M_BMPDATA->m_mask->m_bitmap, rect.x, rect.y, 0, 0, rect.width, rect.height);
g_object_unref (gc);
ret.SetMask( mask );
{
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;
GdkPixbuf *pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB,
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 0
- if (gdk_pixbuf_get_has_alpha( pixbuf ))
- wxPrintf( wxT("Has alpha\n") );
- else
- wxPrintf( wxT("No alpha.\n") );
-#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