#include "wx/bitmap.h"
#ifndef WX_PRECOMP
- #include "wx/app.h"
- #include "wx/dcmemory.h"
- #include "wx/palette.h"
#include "wx/icon.h"
+ #include "wx/image.h"
+ #include "wx/colour.h"
#endif
-#include "wx/filefn.h"
-#include "wx/image.h"
-
#include "wx/rawbmp.h"
- // need this to get gdk_image_new_bitmap()
- #define GDK_ENABLE_BROKEN
-
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
-#include <gdk/gdkx.h>
-#include <gdk/gdkimage.h>
+#include "wx/gtk/private/object.h"
+#include "wx/gtk/private.h"
-#include "wx/math.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);
+extern GtkWidget *wxGetRootWindow();
-//-----------------------------------------------------------------------------
-// data
-//-----------------------------------------------------------------------------
+#ifndef __WXGTK3__
+static void PixmapToPixbuf(GdkPixmap* pixmap, GdkPixbuf* pixbuf, int w, int h)
+{
+ gdk_pixbuf_get_from_drawable(pixbuf, pixmap, NULL, 0, 0, 0, 0, w, h);
+ if (gdk_drawable_get_depth(pixmap) == 1)
+ {
+ // invert to match XBM convention
+ guchar* p = gdk_pixbuf_get_pixels(pixbuf);
+ const int inc = 3 + int(gdk_pixbuf_get_has_alpha(pixbuf) != 0);
+ const int rowpad = gdk_pixbuf_get_rowstride(pixbuf) - w * inc;
+ for (int y = h; y; y--, p += rowpad)
+ for (int x = w; x; x--, p += inc)
+ {
+ // pixels are either (0,0,0) or (0xff,0xff,0xff)
+ p[0] = ~p[0];
+ p[1] = ~p[1];
+ p[2] = ~p[2];
+ }
+ }
+}
-extern GtkWidget *wxGetRootWindow();
+static void MaskToAlpha(GdkPixmap* mask, GdkPixbuf* pixbuf, int w, int h)
+{
+ GdkPixbuf* mask_pixbuf = gdk_pixbuf_get_from_drawable(
+ NULL, mask, NULL, 0, 0, 0, 0, w, h);
+ guchar* p = gdk_pixbuf_get_pixels(pixbuf) + 3;
+ const guchar* mask_data = gdk_pixbuf_get_pixels(mask_pixbuf);
+ const int rowpad = gdk_pixbuf_get_rowstride(pixbuf) - w * 4;
+ const int mask_rowpad = gdk_pixbuf_get_rowstride(mask_pixbuf) - w * 3;
+ for (int y = h; y; y--, p += rowpad, mask_data += mask_rowpad)
+ {
+ for (int x = w; x; x--, p += 4, mask_data += 3)
+ {
+ *p = 255;
+ // no need to test all 3 components,
+ // pixels are either (0,0,0) or (0xff,0xff,0xff)
+ if (mask_data[0] == 0)
+ *p = 0;
+ }
+ }
+ g_object_unref(mask_pixbuf);
+}
+#endif
//-----------------------------------------------------------------------------
// wxMask
//-----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxMask,wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxMask, wxMaskBase)
wxMask::wxMask()
{
- m_bitmap = (GdkBitmap *) NULL;
+ m_bitmap = NULL;
+}
+
+wxMask::wxMask(const wxMask& mask)
+{
+#ifdef __WXGTK3__
+ m_bitmap = NULL;
+ if (mask.m_bitmap)
+ {
+ const int w = cairo_image_surface_get_width(mask.m_bitmap);
+ const int h = cairo_image_surface_get_height(mask.m_bitmap);
+ m_bitmap = cairo_image_surface_create(CAIRO_FORMAT_A8, w, h);
+ const guchar* src = cairo_image_surface_get_data(mask.m_bitmap);
+ guchar* dst = cairo_image_surface_get_data(m_bitmap);
+ const int stride = cairo_image_surface_get_stride(m_bitmap);
+ wxASSERT(stride == cairo_image_surface_get_stride(mask.m_bitmap));
+ memcpy(dst, src, stride * h);
+ cairo_surface_mark_dirty(m_bitmap);
+ }
+#else
+ if ( !mask.m_bitmap )
+ {
+ m_bitmap = NULL;
+ return;
+ }
+
+ // create a copy of an existing mask
+ gint w, h;
+ gdk_drawable_get_size(mask.m_bitmap, &w, &h);
+ m_bitmap = gdk_pixmap_new(mask.m_bitmap, w, h, 1);
+
+ wxGtkObject<GdkGC> gc(gdk_gc_new(m_bitmap));
+ gdk_draw_drawable(m_bitmap, gc, mask.m_bitmap, 0, 0, 0, 0, -1, -1);
+#endif
}
wxMask::wxMask( const wxBitmap& bitmap, const wxColour& colour )
{
- m_bitmap = (GdkBitmap *) NULL;
- Create( bitmap, colour );
+ m_bitmap = NULL;
+ InitFromColour(bitmap, colour);
}
#if wxUSE_PALETTE
wxMask::wxMask( const wxBitmap& bitmap, int paletteIndex )
{
- m_bitmap = (GdkBitmap *) NULL;
+ m_bitmap = NULL;
Create( bitmap, paletteIndex );
}
#endif // wxUSE_PALETTE
wxMask::wxMask( const wxBitmap& bitmap )
{
- m_bitmap = (GdkBitmap *) NULL;
- Create( bitmap );
+ m_bitmap = NULL;
+ InitFromMonoBitmap(bitmap);
+}
+
+#ifdef __WXGTK3__
+wxMask::wxMask(cairo_surface_t* bitmap)
+#else
+wxMask::wxMask(GdkPixmap* bitmap)
+#endif
+{
+ m_bitmap = bitmap;
}
wxMask::~wxMask()
{
if (m_bitmap)
+ {
+#ifdef __WXGTK3__
+ cairo_surface_destroy(m_bitmap);
+#else
g_object_unref (m_bitmap);
+#endif
+ }
}
-bool wxMask::Create( const wxBitmap& bitmap,
- const wxColour& colour )
+void wxMask::FreeData()
{
if (m_bitmap)
{
+#ifdef __WXGTK3__
+ cairo_surface_destroy(m_bitmap);
+#else
g_object_unref (m_bitmap);
- m_bitmap = (GdkBitmap*) NULL;
+#endif
+ m_bitmap = 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.red = 65000;
- color.green = 65000;
- color.blue = 65000;
- color.pixel = 1;
- gdk_gc_set_foreground( gc, &color );
- gdk_gc_set_fill( gc, GDK_SOLID );
- gdk_draw_rectangle( m_bitmap, gc, TRUE, 0, 0, image.GetWidth(), image.GetHeight() );
-
- unsigned char *data = image.GetData();
- int index = 0;
-
- unsigned char red = colour.Red();
- unsigned char green = colour.Green();
- unsigned char blue = colour.Blue();
-
- 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)
+bool wxMask::InitFromColour(const wxBitmap& bitmap, const wxColour& colour)
+{
+ const int w = bitmap.GetWidth();
+ const int h = bitmap.GetHeight();
+
+#ifdef __WXGTK3__
+ m_bitmap = cairo_image_surface_create(CAIRO_FORMAT_A8, w, h);
+ GdkPixbuf* pixbuf = bitmap.GetPixbufNoMask();
+ const guchar* src = gdk_pixbuf_get_pixels(pixbuf);
+ guchar* dst = cairo_image_surface_get_data(m_bitmap);
+ const int stride_src = gdk_pixbuf_get_rowstride(pixbuf);
+ const int stride_dst = cairo_image_surface_get_stride(m_bitmap);
+ const int src_inc = gdk_pixbuf_get_n_channels(pixbuf);
+ const guchar r = colour.Red();
+ const guchar g = colour.Green();
+ const guchar b = colour.Blue();
+ for (int j = 0; j < h; j++, src += stride_src, dst += stride_dst)
{
- red = red & 0xf8;
- green = green & 0xfc;
- blue = blue & 0xf8;
+ const guchar* s = src;
+ for (int i = 0; i < w; i++, s += src_inc)
+ {
+ dst[i] = 0xff;
+ if (s[0] == r && s[1] == g && s[2] == b)
+ dst[i] = 0;
+ }
}
- else if (bpp == 12)
+ cairo_surface_mark_dirty(m_bitmap);
+#else
+ // create mask as 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 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.red = 0;
- color.green = 0;
- color.blue = 0;
- 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;
+#endif
return true;
}
-#if wxUSE_PALETTE
-bool wxMask::Create( const wxBitmap& bitmap, int paletteIndex )
-{
- unsigned char r,g,b;
- wxPalette *pal = bitmap.GetPalette();
-
- wxCHECK_MSG( pal, false, wxT("Cannot create mask from bitmap without palette") );
-
- pal->GetRGB(paletteIndex, &r, &g, &b);
-
- return Create(bitmap, wxColour(r, g, b));
-}
-#endif // wxUSE_PALETTE
-
-bool wxMask::Create( const wxBitmap& bitmap )
+bool wxMask::InitFromMonoBitmap(const wxBitmap& bitmap)
{
- if (m_bitmap)
- {
- g_object_unref (m_bitmap);
- m_bitmap = (GdkBitmap*) NULL;
- }
-
- if (!bitmap.Ok()) return false;
+ if (!bitmap.IsOk()) return false;
- wxCHECK_MSG( bitmap.GetBitmap(), false, wxT("Cannot create mask from colour bitmap") );
+ wxCHECK_MSG( bitmap.GetDepth() == 1, false, wxT("Cannot create mask from colour bitmap") );
+#ifdef __WXGTK3__
+ InitFromColour(bitmap, *wxBLACK);
+#else
m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, bitmap.GetWidth(), bitmap.GetHeight(), 1 );
if (!m_bitmap) return false;
- GdkGC *gc = gdk_gc_new( m_bitmap );
-
- gdk_wx_draw_bitmap( m_bitmap, gc, bitmap.GetBitmap(), 0, 0, 0, 0, bitmap.GetWidth(), bitmap.GetHeight() );
-
- g_object_unref (gc);
+ wxGtkObject<GdkGC> gc(gdk_gc_new( m_bitmap ));
+ gdk_gc_set_function(gc, GDK_COPY_INVERT);
+ gdk_draw_drawable(m_bitmap, gc, bitmap.GetPixmap(), 0, 0, 0, 0, bitmap.GetWidth(), bitmap.GetHeight());
+#endif
return true;
}
-GdkBitmap *wxMask::GetBitmap() const
+#ifdef __WXGTK3__
+cairo_surface_t* wxMask::GetBitmap() const
+#else
+GdkPixmap* wxMask::GetBitmap() const
+#endif
{
return m_bitmap;
}
//-----------------------------------------------------------------------------
-// wxBitmap
+// wxBitmapRefData
//-----------------------------------------------------------------------------
-class wxBitmapRefData: public wxObjectRefData
+class wxBitmapRefData: public wxGDIRefData
{
public:
- wxBitmapRefData();
- ~wxBitmapRefData();
+ wxBitmapRefData(int width, int height, int depth);
+ virtual ~wxBitmapRefData();
+ virtual bool IsOk() const;
+
+#ifdef __WXGTK3__
+ GdkPixbuf* m_pixbufMask;
+ GdkPixbuf* m_pixbufNoMask;
+ cairo_surface_t* m_surface;
+#else
GdkPixmap *m_pixmap;
- GdkBitmap *m_bitmap;
GdkPixbuf *m_pixbuf;
+#endif
wxMask *m_mask;
int m_width;
int m_height;
int m_bpp;
- wxPalette *m_palette;
+#ifndef __WXGTK3__
+ bool m_alphaRequested;
+#endif
+
+ // We don't provide a copy ctor as copying m_pixmap and m_pixbuf properly
+ // is expensive and we don't want to do it implicitly (and possibly
+ // accidentally). wxBitmap::CloneGDIRefData() which does need to do it does
+ // it explicitly itself.
+ wxDECLARE_NO_COPY_CLASS(wxBitmapRefData);
};
-wxBitmapRefData::wxBitmapRefData()
+wxBitmapRefData::wxBitmapRefData(int width, int height, int depth)
{
- m_pixmap = (GdkPixmap *) NULL;
- m_bitmap = (GdkBitmap *) NULL;
- m_pixbuf = (GdkPixbuf *) NULL;
- m_mask = (wxMask *) NULL;
- m_width = 0;
- m_height = 0;
- m_bpp = 0;
- m_palette = (wxPalette *) NULL;
+#ifdef __WXGTK3__
+ m_pixbufMask = NULL;
+ m_pixbufNoMask = NULL;
+ m_surface = NULL;
+#else
+ m_pixmap = NULL;
+ m_pixbuf = NULL;
+#endif
+ m_mask = NULL;
+ m_width = width;
+ m_height = height;
+ m_bpp = depth;
+#ifdef __WXGTK3__
+ if (m_bpp != 1 && m_bpp != 32)
+ m_bpp = 24;
+#else
+ if (m_bpp < 0)
+ m_bpp = gdk_drawable_get_depth(wxGetRootWindow()->window);
+ m_alphaRequested = depth == 32;
+#endif
}
wxBitmapRefData::~wxBitmapRefData()
{
+#ifdef __WXGTK3__
+ if (m_pixbufMask)
+ g_object_unref(m_pixbufMask);
+ if (m_pixbufNoMask)
+ g_object_unref(m_pixbufNoMask);
+ if (m_surface)
+ cairo_surface_destroy(m_surface);
+#else
if (m_pixmap)
g_object_unref (m_pixmap);
- if (m_bitmap)
- g_object_unref (m_bitmap);
if (m_pixbuf)
g_object_unref (m_pixbuf);
+#endif
delete m_mask;
-#if wxUSE_PALETTE
- delete m_palette;
-#endif // wxUSE_PALETTE
}
+bool wxBitmapRefData::IsOk() const
+{
+ return m_bpp != 0;
+}
+
+//-----------------------------------------------------------------------------
+// wxBitmap
//-----------------------------------------------------------------------------
-#define M_BMPDATA ((wxBitmapRefData *)m_refData)
+#define M_BMPDATA static_cast<wxBitmapRefData*>(m_refData)
IMPLEMENT_DYNAMIC_CLASS(wxBitmap,wxGDIObject)
-wxBitmap::wxBitmap()
+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)
{
- Create( width, height, depth );
-}
-
-bool wxBitmap::Create( int width, int height, int depth )
-{
- UnRef();
-
- if ( width <= 0 || height <= 0 )
+ wxASSERT(depth == 1);
+ if (width > 0 && height > 0 && depth == 1)
{
- return false;
+ m_refData = new wxBitmapRefData(width, height, 1);
+#ifdef __WXGTK3__
+ GdkPixbuf* pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, false, 8, width, height);
+ M_BMPDATA->m_pixbufNoMask = pixbuf;
+ const char* src = bits;
+ guchar* dst = gdk_pixbuf_get_pixels(pixbuf);
+ const int stride_src = (width + 7) / 8;
+ const int rowinc_dst = gdk_pixbuf_get_rowstride(pixbuf) - 3 * width;
+ for (int j = 0; j < width; j++, src += stride_src, dst += rowinc_dst)
+ {
+ for (int i = 0; i < height; i++)
+ {
+ guchar c = 0xff;
+ if (src[i >> 3] & (1 << (i & 7)))
+ c = 0;
+ *dst++ = c;
+ *dst++ = c;
+ *dst++ = c;
+ }
+ }
+#else
+ M_BMPDATA->m_pixmap = gdk_bitmap_create_from_data(
+ wxGetRootWindow()->window, bits, width, height);
+#endif
}
+}
- GdkVisual *visual = wxTheApp->GetGdkVisual();
-
- if (depth == -1)
- depth = visual->depth;
-
- wxCHECK_MSG( (depth == visual->depth) || (depth == 1) || (depth == 32), false,
- wxT("invalid bitmap depth") );
+wxBitmap::wxBitmap(const char* const* bits)
+{
+ wxCHECK2_MSG(bits != NULL, return, wxT("invalid bitmap data"));
- m_refData = new wxBitmapRefData();
- M_BMPDATA->m_mask = (wxMask *) NULL;
- M_BMPDATA->m_width = width;
- M_BMPDATA->m_height = height;
- if (depth == 1)
+#if wxUSE_IMAGE
+ *this = wxBitmap(wxImage(bits));
+#elif defined __WXGTK3__
+ GdkPixbuf* pixbuf = gdk_pixbuf_new_from_xpm_data(const_cast<const char**>(bits));
+ if (pixbuf)
{
- M_BMPDATA->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 );
- M_BMPDATA->m_bpp = 1;
+ m_refData = new wxBitmapRefData(
+ gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf),
+ gdk_pixbuf_get_n_channels(pixbuf) * 8);
+ M_BMPDATA->m_pixbufNoMask = pixbuf;
+ wxASSERT(M_BMPDATA->m_bpp == 32 || !gdk_pixbuf_get_has_alpha(M_BMPDATA->m_pixbufNoMask));
}
- else if (depth == 32)
- {
- M_BMPDATA->m_pixbuf = gdk_pixbuf_new( GDK_COLORSPACE_RGB, true,
- 8, width, height);
- M_BMPDATA->m_bpp = 32;
- }
- else
+#else
+ GdkBitmap* mask = NULL;
+ GdkPixmap* pixmap = gdk_pixmap_create_from_xpm_d(wxGetRootWindow()->window, &mask, NULL, const_cast<char**>(bits));
+ if (pixmap)
{
- M_BMPDATA->m_pixmap = gdk_pixmap_new( wxGetRootWindow()->window, width, height, depth );
- M_BMPDATA->m_bpp = visual->depth;
+ int width, height;
+ gdk_drawable_get_size(pixmap, &width, &height);
+ m_refData = new wxBitmapRefData(width, height, -1);
+ M_BMPDATA->m_pixmap = pixmap;
+ if (mask)
+ {
+ M_BMPDATA->m_mask = new wxMask(mask);
+ }
}
-
- return Ok();
+#endif
}
-bool wxBitmap::CreateFromXpm( const char **bits )
+wxBitmap::wxBitmap(GdkPixbuf* pixbuf)
{
- UnRef();
-
- wxCHECK_MSG( bits != NULL, false, wxT("invalid bitmap data") );
-
- GdkVisual *visual = wxTheApp->GetGdkVisual();
-
- m_refData = new wxBitmapRefData();
-
- GdkBitmap *mask = (GdkBitmap*) NULL;
-
- M_BMPDATA->m_pixmap = 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)
+ if (pixbuf)
{
- M_BMPDATA->m_mask = new wxMask();
- M_BMPDATA->m_mask->m_bitmap = mask;
+ wxBitmapRefData* bmpData = new wxBitmapRefData(
+ gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf),
+ gdk_pixbuf_get_n_channels(pixbuf) * 8);
+ m_refData = bmpData;
+#ifdef __WXGTK3__
+ bmpData->m_pixbufNoMask = pixbuf;
+#else
+ bmpData->m_pixbuf = pixbuf;
+#endif
}
+}
- gdk_drawable_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
-
- M_BMPDATA->m_bpp = visual->depth; // Can we get a different depth from create_from_xpm_d() ?
+wxBitmap::~wxBitmap()
+{
+}
+bool wxBitmap::Create( int width, int height, int depth )
+{
+ UnRef();
+ wxCHECK_MSG(width >= 0 && height >= 0, false, "invalid bitmap size");
+ m_refData = new wxBitmapRefData(width, height, depth);
return true;
}
-wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight, int newx, int newy )
+#ifdef __WXGTK3__
+static void CopyImageData(
+ guchar* dst, int dstChannels, int dstStride,
+ const guchar* src, int srcChannels, int srcStride,
+ int w, int h)
{
- wxCHECK_MSG( Ok(), wxNullBitmap, wxT("invalid bitmap") );
-
- if (newy==M_BMPDATA->m_width && newy==M_BMPDATA->m_height)
- return *this;
-
- int width = wxMax(newx, 1);
- int height = wxMax(newy, 1);
- width = wxMin(width, clipwidth);
- height = wxMin(height, clipheight);
-
- wxBitmap bmp;
-
- if (HasPixbuf())
- {
- bmp.SetWidth(width);
- bmp.SetHeight(height);
- 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(),
- 0, 0, width, height,
- clipx, clipy,
- (double)newx/GetWidth(), (double)newy/GetHeight(),
- GDK_INTERP_BILINEAR);
- }
- else
+ if (dstChannels == srcChannels)
{
- GdkImage *img = (GdkImage*) NULL;
- if (GetPixmap())
- img = gdk_image_get( GetPixmap(), 0, 0, GetWidth(), GetHeight() );
- else if (GetBitmap())
- img = gdk_image_get( GetBitmap(), 0, 0, GetWidth(), GetHeight() );
+ if (dstStride == srcStride)
+ memcpy(dst, src, size_t(dstStride) * h);
else
- wxFAIL_MSG( wxT("Ill-formed bitmap") );
-
- wxCHECK_MSG( img, wxNullBitmap, wxT("couldn't create image") );
-
- int bpp = -1;
-
-
- GdkGC *gc = NULL;
- GdkPixmap *dstpix = NULL;
- if (GetPixmap())
{
- GdkVisual *visual = gdk_drawable_get_visual( GetPixmap() );
- if (visual == NULL)
- visual = wxTheApp->GetGdkVisual();
-
- bpp = visual->depth;
- bmp = wxBitmap(width,height,bpp);
- dstpix = bmp.GetPixmap();
- gc = gdk_gc_new( dstpix );
+ const int stride = dstStride < srcStride ? dstStride : srcStride;
+ for (int j = 0; j < h; j++, src += srcStride, dst += dstStride)
+ memcpy(dst, src, stride);
}
-
- char *dst = NULL;
- long dstbyteperline = 0;
-
- if (GetBitmap())
- {
- bpp = 1;
- dstbyteperline = width/8*M_BMPDATA->m_bpp;
- if (width*M_BMPDATA->m_bpp % 8 != 0)
- dstbyteperline++;
- dst = (char*) malloc(dstbyteperline*height);
- }
-
- // be careful to use the right scaling factor
- float scx = (float)M_BMPDATA->m_width/(float)newx;
- float scy = (float)M_BMPDATA->m_height/(float)newy;
- // prepare accel-tables
- int *tablex = (int *)calloc(width,sizeof(int));
- int *tabley = (int *)calloc(height,sizeof(int));
-
- // accel table filled with clipped values
- for (int x = 0; x < width; x++)
- tablex[x] = (int) (scx * (x+clipx));
- for (int y = 0; y < height; y++)
- tabley[y] = (int) (scy * (y+clipy));
-
- // Main rescaling routine starts here
- for (int h = 0; h < height; h++)
+ }
+ else
+ {
+ for (int j = 0; j < h; j++, src += srcStride, dst += dstStride)
{
- char outbyte = 0;
- int old_x = -1;
- guint32 old_pixval = 0;
-
- for (int w = 0; w < width; w++)
+ guchar* d = dst;
+ const guchar* s = src;
+ if (dstChannels == 4)
{
- guint32 pixval;
- int x = tablex[w];
- if (x == old_x)
- pixval = old_pixval;
- else
- {
- pixval = gdk_image_get_pixel( img, x, tabley[h] );
- old_pixval = pixval;
- old_x = x;
- }
-
- if ( dst )
+ for (int i = 0; i < w; i++, d += 4, s += 3)
{
- if (!pixval)
- {
- char bit=1;
- char shift = bit << (w % 8);
- outbyte |= shift;
- }
-
- if ((w+1)%8==0)
- {
- dst[h*dstbyteperline+w/8] = outbyte;
- outbyte = 0;
- }
- }
- else
- {
- GdkColor col;
- col.pixel = pixval;
- gdk_gc_set_foreground( gc, &col );
- gdk_draw_point( dstpix, gc, w, h);
+ d[0] = s[0];
+ d[1] = s[1];
+ d[2] = s[2];
+ d[3] = 0xff;
}
}
-
- // do not forget the last byte
- if ( dst && (width % 8 != 0) )
- dst[h*dstbyteperline+width/8] = outbyte;
- }
-
- g_object_unref (img);
- if (gc) g_object_unref (gc);
-
- if ( dst )
- {
- bmp = wxBitmap( (const char *)dst, width, height, 1 );
- free( dst );
- }
-
- if (GetMask())
- {
- dstbyteperline = width/8;
- if (width % 8 != 0)
- dstbyteperline++;
- dst = (char*) malloc(dstbyteperline*height);
- img = gdk_image_get( GetMask()->GetBitmap(), 0, 0, GetWidth(), GetHeight() );
-
- for (int h = 0; h < height; h++)
+ else
{
- char outbyte = 0;
- int old_x = -1;
- guint32 old_pixval = 0;
-
- for (int w = 0; w < width; w++)
+ for (int i = 0; i < w; i++, d += 3, s += 4)
{
- guint32 pixval;
- int x = tablex[w];
- if (x == old_x)
- pixval = old_pixval;
- else
- {
- pixval = gdk_image_get_pixel( img, x, tabley[h] );
- old_pixval = pixval;
- old_x = x;
- }
-
- if (pixval)
- {
- char bit=1;
- char shift = bit << (w % 8);
- outbyte |= shift;
- }
-
- if ((w+1)%8 == 0)
- {
- dst[h*dstbyteperline+w/8] = outbyte;
- outbyte = 0;
- }
+ d[0] = s[0];
+ d[1] = s[1];
+ d[2] = s[2];
}
-
- // do not forget the last byte
- if (width % 8 != 0)
- dst[h*dstbyteperline+width/8] = outbyte;
}
- wxMask* mask = new wxMask;
- mask->m_bitmap = gdk_bitmap_create_from_data( wxGetRootWindow()->window, (gchar *) dst, width, height );
- bmp.SetMask(mask);
-
- free( dst );
- g_object_unref (img);
}
-
- free( tablex );
- free( tabley );
}
-
- return bmp;
}
+#endif
-bool wxBitmap::CreateFromImage(const wxImage& image, int depth)
+#if wxUSE_IMAGE
+#ifdef __WXGTK3__
+wxBitmap::wxBitmap(const wxImage& image, int depth)
{
- UnRef();
-
- wxCHECK_MSG( image.Ok(), false, wxT("invalid image") );
- wxCHECK_MSG( depth == -1 || depth == 1, false, wxT("invalid bitmap depth") );
-
- if (image.GetWidth() <= 0 || image.GetHeight() <= 0)
- return false;
-
- m_refData = new wxBitmapRefData();
-
- if (depth == 1)
+ wxCHECK_RET(image.IsOk(), "invalid image");
+
+ const int w = image.GetWidth();
+ const int h = image.GetHeight();
+ const guchar* alpha = image.GetAlpha();
+ if (depth < 0)
+ depth = alpha ? 32 : 24;
+ else if (depth != 1 && depth != 32)
+ depth = 24;
+ wxBitmapRefData* bmpData = new wxBitmapRefData(w, h, depth);
+ m_refData = bmpData;
+ GdkPixbuf* pixbuf_dst = gdk_pixbuf_new(GDK_COLORSPACE_RGB, depth == 32, 8, w, h);
+ bmpData->m_pixbufNoMask = pixbuf_dst;
+ wxASSERT(bmpData->m_bpp == 32 || !gdk_pixbuf_get_has_alpha(bmpData->m_pixbufNoMask));
+ const guchar* src = image.GetData();
+
+ guchar* dst = gdk_pixbuf_get_pixels(pixbuf_dst);
+ const int dstStride = gdk_pixbuf_get_rowstride(pixbuf_dst);
+ CopyImageData(dst, gdk_pixbuf_get_n_channels(pixbuf_dst), dstStride, src, 3, 3 * w, w, h);
+
+ if (depth == 32 && alpha)
{
- return CreateFromImageAsBitmap(image);
+ for (int j = 0; j < h; j++, dst += dstStride)
+ for (int i = 0; i < w; i++)
+ dst[i * 4 + 3] = *alpha++;
}
- else
+ if (image.HasMask())
{
- if (image.HasAlpha())
- return CreateFromImageAsPixbuf(image);
-
- return CreateFromImageAsPixmap(image);
+ const guchar r = image.GetMaskRed();
+ const guchar g = image.GetMaskGreen();
+ const guchar b = image.GetMaskBlue();
+ cairo_surface_t* surface = cairo_image_surface_create(CAIRO_FORMAT_A8, w, h);
+ const int stride = cairo_image_surface_get_stride(surface);
+ dst = cairo_image_surface_get_data(surface);
+ memset(dst, 0xff, stride * h);
+ for (int j = 0; j < h; j++, dst += stride)
+ for (int i = 0; i < w; i++, src += 3)
+ if (src[0] == r && src[1] == g && src[2] == b)
+ dst[i] = 0;
+ cairo_surface_mark_dirty(surface);
+ bmpData->m_mask = new wxMask(surface);
}
}
-
-// conversion to mono bitmap:
-bool wxBitmap::CreateFromImageAsBitmap(const wxImage& img)
+#else
+wxBitmap::wxBitmap(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();
+ wxCHECK_RET(image.IsOk(), "invalid image");
- SetHeight( height );
- SetWidth( width );
-
- SetBitmap( gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 ) );
-
- SetDepth( 1 );
-
- GdkVisual *visual = wxTheApp->GetGdkVisual();
-
- // Create picture image
-
- unsigned char *data_data = (unsigned char*)malloc( ((width >> 3)+8) * height );
-
- GdkImage *data_image =
- gdk_image_new_bitmap( visual, data_data, width, height );
-
- // Create mask image
-
- GdkImage *mask_image = (GdkImage*) NULL;
-
- if (image.HasMask())
- {
- unsigned char *mask_data = (unsigned char*)malloc( ((width >> 3)+8) * height );
-
- mask_image = gdk_image_new_bitmap( visual, mask_data, width, height );
-
- wxMask *mask = new wxMask();
- mask->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 );
-
- 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++)
- {
- int r = data[index];
- index++;
- int g = data[index];
- index++;
- int b = data[index];
- index++;
-
- if (image.HasMask())
- {
- if ((r == r_mask) && (b == b_mask) && (g == g_mask))
- gdk_image_put_pixel( mask_image, x, y, 1 );
- else
- gdk_image_put_pixel( mask_image, x, y, 0 );
- }
-
- if ((r == 255) && (b == 255) && (g == 255))
- gdk_image_put_pixel( data_image, x, y, 1 );
- else
- gdk_image_put_pixel( data_image, x, y, 0 );
-
- } // for
- } // for
-
- // Blit picture
-
- GdkGC *data_gc = gdk_gc_new( GetBitmap() );
-
- gdk_draw_image( GetBitmap(), data_gc, data_image, 0, 0, 0, 0, width, height );
-
- g_object_unref (data_image);
- g_object_unref (data_gc);
-
- // Blit mask
-
- if (image.HasMask())
- {
- GdkGC *mask_gc = gdk_gc_new( GetMask()->GetBitmap() );
-
- 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;
+ if (depth == 32 || (depth == -1 && image.HasAlpha()))
+ CreateFromImageAsPixbuf(image);
+ else
+ // otherwise create pixmap, if alpha is present it will be converted to mask
+ CreateFromImageAsPixmap(image, depth);
}
-// conversion to colour bitmap:
-bool wxBitmap::CreateFromImageAsPixmap(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();
-
- SetHeight( height );
- SetWidth( width );
-
- SetPixmap( gdk_pixmap_new( wxGetRootWindow()->window, width, height, -1 ) );
-
- GdkVisual *visual = wxTheApp->GetGdkVisual();
-
- int bpp = visual->depth;
-
- SetDepth( bpp );
-
- if ((bpp == 16) && (visual->red_mask != 0xf800))
- bpp = 15;
- else if (bpp < 8)
- bpp = 8;
-
- // We handle 8-bit bitmaps ourselves using the colour cube, 12-bit
- // visuals are not supported by GDK so we do these ourselves, too.
- // 15-bit and 16-bit should actually work and 24-bit certainly does.
-#ifdef __sgi
- if (!image.HasMask() && (bpp > 16))
-#else
- if (!image.HasMask() && (bpp > 12))
-#endif
+ const int w = image.GetWidth();
+ const int h = image.GetHeight();
+ if (depth == 1)
{
- static bool s_hasInitialized = false;
-
- if (!s_hasInitialized)
+ // 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++)
{
- gdk_rgb_init();
- s_hasInitialized = true;
+ 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;
- 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);
- return true;
+ if (!M_BMPDATA) // SetPixmap may have failed
+ return false;
}
-
- // Create picture image
-
- GdkImage *data_image =
- gdk_image_new( GDK_IMAGE_FASTEST, visual, width, height );
-
- // Create mask image
-
- GdkImage *mask_image = (GdkImage*) NULL;
-
- if (image.HasMask())
+ else
{
- unsigned char *mask_data = (unsigned char*)malloc( ((width >> 3)+8) * height );
-
- mask_image = gdk_image_new_bitmap( visual, mask_data, width, height );
-
- wxMask *mask = new wxMask();
- mask->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 );
+ SetPixmap(gdk_pixmap_new(wxGetRootWindow()->window, w, h, depth));
+ if (!M_BMPDATA)
+ return false;
- SetMask( mask );
+ wxGtkObject<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);
}
- // Render
-
- enum byte_order { RGB, RBG, BRG, BGR, GRB, GBR };
- byte_order b_o = RGB;
-
- if (bpp > 8)
+ const wxByte* alpha = image.GetAlpha();
+ if (alpha != NULL || image.HasMask())
{
- if ((visual->red_mask > visual->green_mask) && (visual->green_mask > visual->blue_mask)) b_o = RGB;
- else if ((visual->red_mask > visual->blue_mask) && (visual->blue_mask > visual->green_mask)) b_o = RBG;
- else if ((visual->blue_mask > visual->red_mask) && (visual->red_mask > visual->green_mask)) b_o = BRG;
- else if ((visual->blue_mask > visual->green_mask) && (visual->green_mask > visual->red_mask)) b_o = BGR;
- else if ((visual->green_mask > visual->red_mask) && (visual->red_mask > visual->blue_mask)) b_o = GRB;
- else if ((visual->green_mask > visual->blue_mask) && (visual->blue_mask > visual->red_mask)) b_o = GBR;
- }
+ // create mask as XBM format bitmap
- 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++)
+ 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 (image.HasMask())
+ 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, 1 );
- else
- 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;
}
-
- switch (bpp)
- {
- case 8:
- {
- int pixel = -1;
- if (wxTheApp->m_colorCube)
- {
- pixel = wxTheApp->m_colorCube[ ((r & 0xf8) << 7) + ((g & 0xf8) << 2) + ((b & 0xf8) >> 3) ];
- }
- else
- {
- GdkColormap *cmap = gtk_widget_get_default_colormap();
- GdkColor *colors = cmap->colors;
- int max = 3 * (65536);
-
- for (int i = 0; i < cmap->size; i++)
- {
- int rdiff = (r << 8) - colors[i].red;
- int gdiff = (g << 8) - colors[i].green;
- int bdiff = (b << 8) - colors[i].blue;
- int sum = ABS (rdiff) + ABS (gdiff) + ABS (bdiff);
- if (sum < max) { pixel = i; max = sum; }
- }
- }
-
- gdk_image_put_pixel( data_image, x, y, pixel );
-
- break;
- }
- case 12: // SGI only
- {
- guint32 pixel = 0;
- switch (b_o)
- {
- case RGB: pixel = ((r & 0xf0) << 4) | (g & 0xf0) | ((b & 0xf0) >> 4); break;
- case RBG: pixel = ((r & 0xf0) << 4) | (b & 0xf0) | ((g & 0xf0) >> 4); break;
- case GRB: pixel = ((g & 0xf0) << 4) | (r & 0xf0) | ((b & 0xf0) >> 4); break;
- case GBR: pixel = ((g & 0xf0) << 4) | (b & 0xf0) | ((r & 0xf0) >> 4); break;
- case BRG: pixel = ((b & 0xf0) << 4) | (r & 0xf0) | ((g & 0xf0) >> 4); break;
- case BGR: pixel = ((b & 0xf0) << 4) | (g & 0xf0) | ((r & 0xf0) >> 4); break;
- }
- gdk_image_put_pixel( data_image, x, y, pixel );
- break;
- }
- case 15:
- {
- guint32 pixel = 0;
- switch (b_o)
- {
- case RGB: pixel = ((r & 0xf8) << 7) | ((g & 0xf8) << 2) | ((b & 0xf8) >> 3); break;
- case RBG: pixel = ((r & 0xf8) << 7) | ((b & 0xf8) << 2) | ((g & 0xf8) >> 3); break;
- case GRB: pixel = ((g & 0xf8) << 7) | ((r & 0xf8) << 2) | ((b & 0xf8) >> 3); break;
- case GBR: pixel = ((g & 0xf8) << 7) | ((b & 0xf8) << 2) | ((r & 0xf8) >> 3); break;
- case BRG: pixel = ((b & 0xf8) << 7) | ((r & 0xf8) << 2) | ((g & 0xf8) >> 3); break;
- case BGR: pixel = ((b & 0xf8) << 7) | ((g & 0xf8) << 2) | ((r & 0xf8) >> 3); break;
- }
- gdk_image_put_pixel( data_image, x, y, pixel );
- break;
- }
- case 16:
- {
- // I actually don't know if for 16-bit displays, it is alway the green
- // component or the second component which has 6 bits.
- guint32 pixel = 0;
- switch (b_o)
- {
- case RGB: pixel = ((r & 0xf8) << 8) | ((g & 0xfc) << 3) | ((b & 0xf8) >> 3); break;
- case RBG: pixel = ((r & 0xf8) << 8) | ((b & 0xfc) << 3) | ((g & 0xf8) >> 3); break;
- case GRB: pixel = ((g & 0xf8) << 8) | ((r & 0xfc) << 3) | ((b & 0xf8) >> 3); break;
- case GBR: pixel = ((g & 0xf8) << 8) | ((b & 0xfc) << 3) | ((r & 0xf8) >> 3); break;
- case BRG: pixel = ((b & 0xf8) << 8) | ((r & 0xfc) << 3) | ((g & 0xf8) >> 3); break;
- case BGR: pixel = ((b & 0xf8) << 8) | ((g & 0xfc) << 3) | ((r & 0xf8) >> 3); break;
- }
- gdk_image_put_pixel( data_image, x, y, pixel );
- break;
- }
- case 32:
- case 24:
- {
- guint32 pixel = 0;
- switch (b_o)
- {
- case RGB: pixel = (r << 16) | (g << 8) | b; break;
- case RBG: pixel = (r << 16) | (b << 8) | g; break;
- case BRG: pixel = (b << 16) | (r << 8) | g; break;
- case BGR: pixel = (b << 16) | (g << 8) | r; break;
- case GRB: pixel = (g << 16) | (r << 8) | b; break;
- case GBR: pixel = (g << 16) | (b << 8) | r; break;
- }
- gdk_image_put_pixel( data_image, x, y, pixel );
- break;
- }
- default: break;
- }
- } // for
- } // for
-
- // Blit picture
-
- GdkGC *data_gc = gdk_gc_new( GetPixmap() );
-
- 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 (image.HasMask())
- {
- GdkGC *mask_gc = gdk_gc_new( GetMask()->GetBitmap() );
-
- 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);
+ }
+ else
+ {
+ 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;
+ }
+ }
+ SetMask(new wxMask(gdk_bitmap_create_from_data(M_BMPDATA->m_pixmap, (char*)out, w, h)));
+ delete[] out;
}
-
- return true;
+ return IsOk();
}
bool wxBitmap::CreateFromImageAsPixbuf(const wxImage& image)
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 = GetPixbuf();
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 );
-
- M_BMPDATA->m_pixbuf = pixbuf;
- SetHeight(height);
- SetWidth(width);
- SetDepth(wxTheApp->GetGdkVisual()->depth);
-
// 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)
+ for (int x = 0; x < width; x++, out += 4, in += 3)
{
out[0] = in[0];
out[1] = in[1];
out[2] = in[2];
- out[3] = *alpha;
+ if (alpha)
+ out[3] = *alpha++;
}
}
return true;
}
+#endif
wxImage wxBitmap::ConvertToImage() const
{
+#ifdef __WXGTK3__
wxImage image;
+ wxCHECK_MSG(IsOk(), image, "invalid bitmap");
+ wxBitmapRefData* bmpData = M_BMPDATA;
+ const int w = bmpData->m_width;
+ const int h = bmpData->m_height;
+ image.Create(w, h, false);
+ guchar* dst = image.GetData();
+ GdkPixbuf* pixbuf_src = NULL;
+ if (bmpData->m_pixbufNoMask)
+ pixbuf_src = bmpData->m_pixbufNoMask;
+ else if (bmpData->m_surface)
+ {
+ pixbuf_src = gdk_pixbuf_get_from_surface(bmpData->m_surface, 0, 0, w, h);
+ bmpData->m_pixbufNoMask = pixbuf_src;
+ wxASSERT(bmpData->m_bpp == 32 || !gdk_pixbuf_get_has_alpha(bmpData->m_pixbufNoMask));
+ }
+ if (pixbuf_src)
+ {
+ const guchar* src = gdk_pixbuf_get_pixels(pixbuf_src);
+ const int srcStride = gdk_pixbuf_get_rowstride(pixbuf_src);
+ const int srcChannels = gdk_pixbuf_get_n_channels(pixbuf_src);
+ CopyImageData(dst, 3, 3 * w, src, srcChannels, srcStride, w, h);
- wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") );
+ if (srcChannels == 4)
+ {
+ image.SetAlpha();
+ guchar* alpha = image.GetAlpha();
+ for (int j = 0; j < h; j++, src += srcStride)
+ {
+ const guchar* s = src;
+ for (int i = 0; i < w; i++, s += 4)
+ *alpha++ = s[3];
+ }
+ }
+ }
+ cairo_surface_t* maskSurf = NULL;
+ if (bmpData->m_mask)
+ maskSurf = bmpData->m_mask->GetBitmap();
+ if (maskSurf)
+ {
+ const guchar r = 1;
+ const guchar g = 2;
+ const guchar b = 3;
+ image.SetMaskColour(r, g, b);
+ wxASSERT(cairo_image_surface_get_format(maskSurf) == CAIRO_FORMAT_A8);
+ const int stride = cairo_image_surface_get_stride(maskSurf);
+ const guchar* src = cairo_image_surface_get_data(maskSurf);
+ for (int j = 0; j < h; j++, src += stride)
+ {
+ for (int i = 0; i < w; i++, dst += 3)
+ if (src[i] == 0)
+ {
+ dst[0] = r;
+ dst[1] = g;
+ dst[2] = b;
+ }
+ else if (dst[0] == r && dst[1] == g && dst[2] == b)
+ dst[2]--;
+ }
+ }
+#else
+ wxCHECK_MSG( IsOk(), 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();
- if (!data)
- {
- wxFAIL_MSG( wxT("couldn't create image") );
- return wxNullImage;
- }
+ 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())
+ GdkPixmap* pixmap = GetPixmap();
+ GdkPixmap* pixmap_invert = NULL;
+ if (GetDepth() == 1)
{
- gdk_image = gdk_image_get( GetPixmap(),
- 0, 0,
- GetWidth(), GetHeight() );
- }
- else if (GetBitmap())
- {
- gdk_image = gdk_image_get( GetBitmap(),
- 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 (GetPixmap())
- {
- 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);
- }
- if (GetBitmap())
- {
- bpp = 1;
+ // mono bitmaps are inverted, i.e. 0 is white
+ pixmap_invert = gdk_pixmap_new(pixmap, w, h, 1);
+ wxGtkObject<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);
+ 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 (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;
- }
- }
- else if (use_shift)
- {
- 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
+ if (gdk_image_get_pixel(image_mask, x, y) == 0)
{
- wxFAIL_MSG( wxT("Image conversion failed. Unknown visual type.") );
+ data[0] = MASK_RED;
+ data[1] = MASK_GREEN;
+ data[2] = MASK_BLUE;
}
-
- if (gdk_image_mask)
+ else if (data[0] == MASK_RED && data[1] == MASK_GREEN && data[2] == MASK_BLUE)
{
- 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);
}
+#endif
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 )
- {
- m_refData = new wxBitmapRefData();
-
- M_BMPDATA->m_mask = (wxMask *) NULL;
- M_BMPDATA->m_bitmap = gdk_bitmap_create_from_data
- (
- wxGetRootWindow()->window,
- (gchar *) bits,
- width,
- height
- );
- M_BMPDATA->m_width = width;
- M_BMPDATA->m_height = height;
- M_BMPDATA->m_bpp = 1;
-
- wxASSERT_MSG( M_BMPDATA->m_bitmap, 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
-{
- return (m_refData != NULL) &&
- (
- M_BMPDATA->m_pixbuf ||
- M_BMPDATA->m_bitmap || M_BMPDATA->m_pixmap
- );
-}
+#endif // wxUSE_IMAGE
int wxBitmap::GetHeight() const
{
- wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") );
+ wxCHECK_MSG( IsOk(), -1, wxT("invalid bitmap") );
return M_BMPDATA->m_height;
}
int wxBitmap::GetWidth() const
{
- wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") );
+ wxCHECK_MSG( IsOk(), -1, wxT("invalid bitmap") );
return M_BMPDATA->m_width;
}
int wxBitmap::GetDepth() const
{
- wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") );
+ wxCHECK_MSG( IsOk(), -1, wxT("invalid bitmap") );
return M_BMPDATA->m_bpp;
}
wxMask *wxBitmap::GetMask() const
{
- wxCHECK_MSG( Ok(), (wxMask *) NULL, wxT("invalid bitmap") );
+ wxCHECK_MSG( IsOk(), NULL, wxT("invalid bitmap") );
return M_BMPDATA->m_mask;
}
void wxBitmap::SetMask( wxMask *mask )
{
- wxCHECK_RET( Ok(), wxT("invalid bitmap") );
-
- if (M_BMPDATA->m_mask) delete M_BMPDATA->m_mask;
+ wxCHECK_RET( IsOk(), wxT("invalid bitmap") );
+ AllocExclusive();
+ delete M_BMPDATA->m_mask;
M_BMPDATA->m_mask = mask;
}
+wxBitmap wxBitmap::GetMaskBitmap() const
+{
+ wxBitmap bitmap;
+ wxBitmapRefData* bmpData = M_BMPDATA;
+#ifdef __WXGTK3__
+ cairo_surface_t* mask = NULL;
+ if (bmpData && bmpData->m_mask)
+ mask = bmpData->m_mask->GetBitmap();
+ if (mask)
+ {
+ const int w = cairo_image_surface_get_width(mask);
+ const int h = cairo_image_surface_get_height(mask);
+ GdkPixbuf* pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, false, 8, w, h);
+ const guchar* src = cairo_image_surface_get_data(mask);
+ guchar* dst = gdk_pixbuf_get_pixels(pixbuf);
+ const int stride_src = cairo_image_surface_get_stride(mask);
+ const int stride_dst = gdk_pixbuf_get_rowstride(pixbuf);
+ for (int j = 0; j < h; j++, src += stride_src, dst += stride_dst)
+ {
+ guchar* d = dst;
+ for (int i = 0; i < w; i++, d += 3)
+ {
+ d[0] = src[i];
+ d[1] = src[i];
+ d[2] = src[i];
+ }
+ }
+ bitmap = wxBitmap(pixbuf);
+ }
+#else
+ GdkPixmap* mask = NULL;
+ if (bmpData && bmpData->m_mask)
+ mask = bmpData->m_mask->GetBitmap();
+ if (mask)
+ {
+ int w, h;
+ gdk_drawable_get_size(mask, &w, &h);
+ GdkPixbuf* pixbuf = gdk_pixbuf_get_from_drawable(
+ NULL, mask, NULL, 0, 0, 0, 0, w, h);
+ bitmap = wxBitmap(pixbuf);
+ }
+#endif
+ return bitmap;
+}
+
bool wxBitmap::CopyFromIcon(const wxIcon& icon)
{
*this = icon;
- return true;
+ return IsOk();
+}
+
+#ifdef __WXGTK3__
+static cairo_surface_t* GetSubSurface(cairo_surface_t* surface, const wxRect& rect)
+{
+ cairo_surface_flush(surface);
+ const cairo_format_t format = cairo_image_surface_get_format(surface);
+ int x = rect.x;
+ if (format != CAIRO_FORMAT_A8)
+ x *= 4;
+ cairo_surface_t* subSurface = cairo_image_surface_create(format, rect.width, rect.height);
+ const int srcStride = cairo_image_surface_get_stride(surface);
+ const int dstStride = cairo_image_surface_get_stride(subSurface);
+ const guchar* src = cairo_image_surface_get_data(surface) + rect.y * srcStride + x;
+ guchar* dst = cairo_image_surface_get_data(subSurface);
+ for (int j = 0; j < rect.height; j++, src += srcStride, dst += dstStride)
+ memcpy(dst, src, dstStride);
+ cairo_surface_mark_dirty(subSurface);
+ return subSurface;
}
+#endif
wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
{
- 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),
- wxNullBitmap, wxT("invalid bitmap or bitmap region") );
+ wxBitmap ret;
- wxBitmap ret( rect.width, rect.height, M_BMPDATA->m_bpp );
- wxASSERT_MSG( ret.Ok(), wxT("GetSubBitmap error") );
+ wxCHECK_MSG(IsOk(), ret, wxT("invalid bitmap"));
- if (HasPixbuf())
+ const int w = rect.width;
+ const int h = rect.height;
+ const wxBitmapRefData* bmpData = M_BMPDATA;
+
+ wxCHECK_MSG(rect.x >= 0 && rect.y >= 0 &&
+ rect.x + w <= bmpData->m_width &&
+ rect.y + h <= bmpData->m_height,
+ ret, wxT("invalid bitmap region"));
+
+ wxBitmapRefData * const newRef = new wxBitmapRefData(w, h, bmpData->m_bpp);
+ ret.m_refData = newRef;
+
+#ifdef __WXGTK3__
+ if (bmpData->m_pixbufNoMask)
{
- GdkPixbuf *pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB,
- gdk_pixbuf_get_has_alpha(GetPixbuf()),
- 8, rect.width, rect.height);
- ret.SetPixbuf(pixbuf);
- gdk_pixbuf_copy_area(GetPixbuf(),
- rect.x, rect.y, rect.width, rect.height,
- pixbuf, 0, 0);
+ GdkPixbuf* pixbuf = gdk_pixbuf_new_subpixbuf(bmpData->m_pixbufNoMask, rect.x, rect.y, w, h);
+ newRef->m_pixbufNoMask = gdk_pixbuf_copy(pixbuf);
+ wxASSERT(newRef->m_bpp == 32 || !gdk_pixbuf_get_has_alpha(newRef->m_pixbufNoMask));
+ g_object_unref(pixbuf);
}
- else
+ else if (bmpData->m_surface)
+ newRef->m_surface = GetSubSurface(bmpData->m_surface, rect);
+
+ cairo_surface_t* maskSurf = NULL;
+ if (bmpData->m_mask)
+ maskSurf = bmpData->m_mask->GetBitmap();
+ if (maskSurf)
{
- if (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 );
- g_object_unref (gc);
- }
- else
- {
- GdkGC *gc = gdk_gc_new( ret.GetBitmap() );
- 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.GetBitmap(), gc, GetBitmap(), rect.x, rect.y, 0, 0, rect.width, rect.height );
- g_object_unref (gc);
- }
+ newRef->m_mask = new wxMask(GetSubSurface(maskSurf, rect));
}
-
- if (GetMask())
+#else
+ if (bmpData->m_pixbuf)
+ {
+ GdkPixbuf* pixbuf =
+ gdk_pixbuf_new_subpixbuf(bmpData->m_pixbuf, rect.x, rect.y, w, h);
+ newRef->m_pixbuf = gdk_pixbuf_copy(pixbuf);
+ g_object_unref(pixbuf);
+ }
+ if (bmpData->m_pixmap)
+ {
+ newRef->m_pixmap = gdk_pixmap_new(bmpData->m_pixmap, w, h, -1);
+ GdkGC* gc = gdk_gc_new(newRef->m_pixmap);
+ gdk_draw_drawable(
+ newRef->m_pixmap, gc, bmpData->m_pixmap, rect.x, rect.y, 0, 0, w, h);
+ g_object_unref(gc);
+ }
+ GdkPixmap* mask = NULL;
+ if (bmpData->m_mask)
+ mask = bmpData->m_mask->GetBitmap();
+ if (mask)
{
- 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 );
- g_object_unref (gc);
-
- ret.SetMask( mask );
+ GdkPixmap* sub_mask = gdk_pixmap_new(mask, w, h, 1);
+ newRef->m_mask = new wxMask(sub_mask);
+ GdkGC* gc = gdk_gc_new(sub_mask);
+ gdk_draw_drawable(
+ sub_mask, gc, mask, rect.x, rect.y, 0, 0, w, h);
+ g_object_unref(gc);
}
+#endif
return ret;
}
bool wxBitmap::SaveFile( const wxString &name, wxBitmapType type, const wxPalette *WXUNUSED(palette) ) const
{
- wxCHECK_MSG( Ok(), false, wxT("invalid bitmap") );
+ wxCHECK_MSG( IsOk(), false, wxT("invalid bitmap") );
- // Try to save the bitmap via wxImage handlers:
+#if wxUSE_IMAGE
+ wxImage image = ConvertToImage();
+ if (image.IsOk() && image.SaveFile(name, type))
+ return true;
+#endif
+ const char* type_name = NULL;
+ switch (type)
{
- wxImage image = ConvertToImage();
- if (image.Ok()) return image.SaveFile( name, type );
+ case wxBITMAP_TYPE_BMP: type_name = "bmp"; break;
+ case wxBITMAP_TYPE_ICO: type_name = "ico"; break;
+ case wxBITMAP_TYPE_JPEG: type_name = "jpeg"; break;
+ case wxBITMAP_TYPE_PNG: type_name = "png"; break;
+ default: break;
}
-
- return false;
+ return type_name &&
+ gdk_pixbuf_save(GetPixbuf(), wxGTK_CONV_FN(name), type_name, NULL, NULL);
}
bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type )
{
- UnRef();
-
- if (!wxFileExists(name))
- return false;
-
- GdkVisual *visual = wxTheApp->GetGdkVisual();
-
- if (type == wxBITMAP_TYPE_XPM)
- {
- m_refData = new wxBitmapRefData();
-
- GdkBitmap *mask = (GdkBitmap*) NULL;
-
- M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm
- (
- wxGetRootWindow()->window,
- &mask,
- NULL,
- name.fn_str()
- );
-
- if (mask)
- {
- M_BMPDATA->m_mask = new wxMask();
- M_BMPDATA->m_mask->m_bitmap = mask;
- }
-
- gdk_drawable_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
-
- M_BMPDATA->m_bpp = visual->depth;
- }
- else // try if wxImage can load it
+#if wxUSE_IMAGE
+ wxImage image;
+ if (image.LoadFile(name, type) && image.IsOk())
+ *this = wxBitmap(image);
+ else
+#endif
{
- wxImage image;
- if ( !image.LoadFile( name, type ) || !image.Ok() )
- return false;
+ wxUnusedVar(type); // The type is detected automatically by GDK.
- *this = wxBitmap(image);
+ *this = wxBitmap(gdk_pixbuf_new_from_file(wxGTK_CONV_FN(name), NULL));
}
- return true;
+ return IsOk();
}
#if wxUSE_PALETTE
wxPalette *wxBitmap::GetPalette() const
{
- if (!Ok())
- return (wxPalette *) NULL;
-
- return M_BMPDATA->m_palette;
+ return NULL;
}
void wxBitmap::SetPalette(const wxPalette& WXUNUSED(palette))
void wxBitmap::SetHeight( int height )
{
- if (!m_refData)
- m_refData = new wxBitmapRefData();
-
+ AllocExclusive();
M_BMPDATA->m_height = height;
}
void wxBitmap::SetWidth( int width )
{
- if (!m_refData)
- m_refData = new wxBitmapRefData();
-
+ AllocExclusive();
M_BMPDATA->m_width = width;
}
void wxBitmap::SetDepth( int depth )
{
- if (!m_refData)
- m_refData = new wxBitmapRefData();
-
+ AllocExclusive();
M_BMPDATA->m_bpp = depth;
}
+#ifndef __WXGTK3__
void wxBitmap::SetPixmap( GdkPixmap *pixmap )
{
- if (!m_refData)
- m_refData = new wxBitmapRefData();
-
- M_BMPDATA->m_pixmap = pixmap;
- PurgeOtherRepresentations(Pixmap);
-}
+ UnRef();
-void wxBitmap::SetBitmap( GdkPixmap *bitmap )
-{
- if (!m_refData)
- m_refData = new wxBitmapRefData();
+ if (!pixmap)
+ return;
- M_BMPDATA->m_bitmap = bitmap;
- PurgeOtherRepresentations(Pixmap);
+ int w, h;
+ gdk_drawable_get_size(pixmap, &w, &h);
+ wxBitmapRefData* bmpData = new wxBitmapRefData(w, h, 0);
+ m_refData = bmpData;
+ bmpData->m_pixmap = pixmap;
+ bmpData->m_bpp = gdk_drawable_get_depth(pixmap);
}
GdkPixmap *wxBitmap::GetPixmap() const
{
- wxCHECK_MSG( Ok(), (GdkPixmap *) NULL, wxT("invalid bitmap") );
+ wxCHECK_MSG( IsOk(), NULL, wxT("invalid bitmap") );
- // create the pixmap on the fly if we use Pixbuf representation:
- if (HasPixbuf() && !HasPixmap())
+ wxBitmapRefData* bmpData = M_BMPDATA;
+ if (bmpData->m_pixmap)
+ return bmpData->m_pixmap;
+
+ if (bmpData->m_pixbuf)
{
- delete M_BMPDATA->m_mask;
- M_BMPDATA->m_mask = new wxMask();
- gdk_pixbuf_render_pixmap_and_mask(M_BMPDATA->m_pixbuf,
- &M_BMPDATA->m_pixmap,
- &M_BMPDATA->m_mask->m_bitmap,
- 128 /*threshold*/);
+ GdkPixmap* pixmap = NULL;
+ GdkPixmap** mask_pixmap = NULL;
+ if (gdk_pixbuf_get_has_alpha(bmpData->m_pixbuf))
+ {
+ // make new mask from alpha
+ mask_pixmap = &pixmap;
+ }
+ gdk_pixbuf_render_pixmap_and_mask(
+ bmpData->m_pixbuf, &bmpData->m_pixmap, mask_pixmap, 128);
+ if (pixmap)
+ {
+ delete bmpData->m_mask;
+ bmpData->m_mask = new wxMask(pixmap);
+ }
}
-
- return M_BMPDATA->m_pixmap;
+ else
+ {
+ bmpData->m_pixmap = gdk_pixmap_new(wxGetRootWindow()->window,
+ bmpData->m_width, bmpData->m_height, bmpData->m_bpp == 1 ? 1 : -1);
+ }
+ return bmpData->m_pixmap;
}
bool wxBitmap::HasPixmap() const
{
- wxCHECK_MSG( Ok(), false, wxT("invalid bitmap") );
+ wxCHECK_MSG( IsOk(), false, wxT("invalid bitmap") );
return M_BMPDATA->m_pixmap != NULL;
}
+#endif
-GdkBitmap *wxBitmap::GetBitmap() const
+#ifdef __WXGTK3__
+GdkPixbuf* wxBitmap::GetPixbufNoMask() const
{
- wxCHECK_MSG( Ok(), (GdkBitmap *) NULL, wxT("invalid bitmap") );
+ wxCHECK_MSG(IsOk(), NULL, "invalid bitmap");
- return M_BMPDATA->m_bitmap;
+ wxBitmapRefData* bmpData = M_BMPDATA;
+ GdkPixbuf* pixbuf = bmpData->m_pixbufNoMask;
+ if (pixbuf)
+ return pixbuf;
+
+ const int w = bmpData->m_width;
+ const int h = bmpData->m_height;
+ if (bmpData->m_surface)
+ pixbuf = gdk_pixbuf_get_from_surface(bmpData->m_surface, 0, 0, w, h);
+ else
+ pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, bmpData->m_bpp == 32, 8, w, h);
+ bmpData->m_pixbufNoMask = pixbuf;
+ wxASSERT(bmpData->m_bpp == 32 || !gdk_pixbuf_get_has_alpha(bmpData->m_pixbufNoMask));
+
+ return pixbuf;
}
-GdkPixbuf *wxBitmap::GetPixbuf() const
+// helper to set up a simulated depth 1 surface
+static void SetSourceSurface1(const wxBitmapRefData* bmpData, cairo_t* cr, int x, int y, const wxColour* fg, const wxColour* bg)
{
- wxCHECK_MSG( Ok(), NULL, wxT("invalid bitmap") );
-
- if (HasPixmap() && !HasPixbuf())
+ GdkPixbuf* pixbuf = gdk_pixbuf_copy(bmpData->m_pixbufNoMask);
+ const int w = bmpData->m_width;
+ const int h = bmpData->m_height;
+ const int stride = gdk_pixbuf_get_rowstride(pixbuf);
+ const int channels = gdk_pixbuf_get_n_channels(pixbuf);
+ guchar* dst = gdk_pixbuf_get_pixels(pixbuf);
+ guchar fg_r = 0, fg_g = 0, fg_b = 0;
+ if (fg && fg->IsOk())
{
- int width = GetWidth();
- int height = GetHeight();
-
- 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);
-
- // apply the mask to created pixbuf:
- if (M_BMPDATA->m_pixbuf && M_BMPDATA->m_mask)
- {
- GdkPixbuf *pmask =
- gdk_pixbuf_get_from_drawable(NULL,
- M_BMPDATA->m_mask->GetBitmap(),
- NULL,
- 0, 0, 0, 0, width, height);
- if (pmask)
+ fg_r = fg->Red();
+ fg_g = fg->Green();
+ fg_b = fg->Blue();
+ }
+ guchar bg_r = 255, bg_g = 255, bg_b = 255;
+ if (bg && bg->IsOk())
+ {
+ bg_r = bg->Red();
+ bg_g = bg->Green();
+ bg_b = bg->Blue();
+ }
+ for (int j = 0; j < h; j++, dst += stride)
+ {
+ guchar* d = dst;
+ for (int i = 0; i < w; i++, d += channels)
+ if (d[0])
+ {
+ d[0] = bg_r;
+ d[1] = bg_g;
+ d[2] = bg_b;
+ }
+ else
{
- guchar *bmp = gdk_pixbuf_get_pixels(pixbuf);
- guchar *mask = gdk_pixbuf_get_pixels(pmask);
- int bmprowinc = gdk_pixbuf_get_rowstride(pixbuf) - 4 * width;
- int maskrowinc = gdk_pixbuf_get_rowstride(pmask) - 3 * width;
+ d[0] = fg_r;
+ d[1] = fg_g;
+ d[2] = fg_b;
+ }
+ }
+ gdk_cairo_set_source_pixbuf(cr, pixbuf, x, y);
+ g_object_unref(pixbuf);
+}
- for (int y = 0; y < height;
- y++, bmp += bmprowinc, mask += maskrowinc)
- {
- for (int x = 0; x < width; x++, bmp += 4, mask += 3)
- {
- if (mask[0] == 0 /*black pixel*/)
- bmp[3] = 0;
- }
- }
+void wxBitmap::SetSourceSurface(cairo_t* cr, int x, int y, const wxColour* fg, const wxColour* bg) const
+{
+ wxBitmapRefData* bmpData = M_BMPDATA;
+ if (bmpData->m_surface)
+ {
+ cairo_set_source_surface(cr, bmpData->m_surface, x, y);
+ return;
+ }
+ wxCHECK_RET(bmpData->m_pixbufNoMask, "no bitmap data");
+ if (bmpData->m_bpp == 1)
+ SetSourceSurface1(bmpData, cr, x, y, fg, bg);
+ else
+ {
+ gdk_cairo_set_source_pixbuf(cr, bmpData->m_pixbufNoMask, x, y);
+ cairo_pattern_get_surface(cairo_get_source(cr), &bmpData->m_surface);
+ cairo_surface_reference(bmpData->m_surface);
+ }
+}
- g_object_unref (pmask);
- }
+cairo_t* wxBitmap::CairoCreate() const
+{
+ wxCHECK_MSG(IsOk(), NULL, "invalid bitmap");
+
+ wxBitmapRefData* bmpData = M_BMPDATA;
+ cairo_t* cr;
+ if (bmpData->m_surface)
+ cr = cairo_create(bmpData->m_surface);
+ else
+ {
+ GdkPixbuf* pixbuf = bmpData->m_pixbufNoMask;
+ const bool useAlpha = bmpData->m_bpp == 32 || (pixbuf && gdk_pixbuf_get_has_alpha(pixbuf));
+ bmpData->m_surface = cairo_image_surface_create(
+ useAlpha ? CAIRO_FORMAT_ARGB32 : CAIRO_FORMAT_RGB24,
+ bmpData->m_width, bmpData->m_height);
+ cr = cairo_create(bmpData->m_surface);
+ if (pixbuf)
+ {
+ gdk_cairo_set_source_pixbuf(cr, pixbuf, 0, 0);
+ cairo_paint(cr);
+ cairo_set_source_rgb(cr, 0, 0, 0);
}
}
-
- return M_BMPDATA->m_pixbuf;
+ if (bmpData->m_pixbufNoMask)
+ {
+ g_object_unref(bmpData->m_pixbufNoMask);
+ bmpData->m_pixbufNoMask = NULL;
+ }
+ if (bmpData->m_pixbufMask)
+ {
+ g_object_unref(bmpData->m_pixbufMask);
+ bmpData->m_pixbufMask = NULL;
+ }
+ wxASSERT(cr && cairo_status(cr) == 0);
+ return cr;
}
-bool wxBitmap::HasPixbuf() const
+void wxBitmap::Draw(cairo_t* cr, int x, int y, bool useMask, const wxColour* fg, const wxColour* bg) const
{
- wxCHECK_MSG( Ok(), false, wxT("invalid bitmap") );
+ wxCHECK_RET(IsOk(), "invalid bitmap");
+
+ wxBitmapRefData* bmpData = M_BMPDATA;
+ SetSourceSurface(cr, x, y, fg, bg);
+ cairo_pattern_set_filter(cairo_get_source(cr), CAIRO_FILTER_NEAREST);
+ cairo_surface_t* mask = NULL;
+ if (useMask && bmpData->m_mask)
+ mask = bmpData->m_mask->GetBitmap();
+ if (mask)
+ cairo_mask_surface(cr, mask, x, y);
+ else
+ cairo_paint(cr);
+}
+#endif
- return M_BMPDATA->m_pixbuf != NULL;
+GdkPixbuf *wxBitmap::GetPixbuf() const
+{
+ wxCHECK_MSG( IsOk(), NULL, wxT("invalid bitmap") );
+
+ wxBitmapRefData* bmpData = M_BMPDATA;
+#ifdef __WXGTK3__
+ if (bmpData->m_pixbufMask)
+ return bmpData->m_pixbufMask;
+
+ if (bmpData->m_pixbufNoMask == NULL)
+ GetPixbufNoMask();
+ cairo_surface_t* mask = NULL;
+ if (bmpData->m_mask)
+ mask = bmpData->m_mask->GetBitmap();
+ if (mask == NULL)
+ return bmpData->m_pixbufNoMask;
+
+ const int w = bmpData->m_width;
+ const int h = bmpData->m_height;
+ bmpData->m_pixbufMask = gdk_pixbuf_new(GDK_COLORSPACE_RGB, true, 8, w, h);
+
+ guchar* dst = gdk_pixbuf_get_pixels(bmpData->m_pixbufMask);
+ const int dstStride = gdk_pixbuf_get_rowstride(bmpData->m_pixbufMask);
+ CopyImageData(dst, 4, dstStride,
+ gdk_pixbuf_get_pixels(bmpData->m_pixbufNoMask),
+ gdk_pixbuf_get_n_channels(bmpData->m_pixbufNoMask),
+ gdk_pixbuf_get_rowstride(bmpData->m_pixbufNoMask),
+ w, h);
+
+ const guchar* src = cairo_image_surface_get_data(mask);
+ const int srcStride = cairo_image_surface_get_stride(mask);
+ for (int j = 0; j < h; j++, src += srcStride, dst += dstStride)
+ for (int i = 0; i < w; i++)
+ if (src[i] == 0)
+ dst[i * 4 + 3] = 0;
+
+ return bmpData->m_pixbufMask;
+#else
+ if (bmpData->m_pixbuf)
+ return bmpData->m_pixbuf;
+
+ const int w = bmpData->m_width;
+ const int h = bmpData->m_height;
+ GdkPixmap* mask = NULL;
+ if (bmpData->m_mask)
+ mask = bmpData->m_mask->GetBitmap();
+ const bool useAlpha = bmpData->m_alphaRequested || mask;
+ bmpData->m_pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, useAlpha, 8, w, h);
+ if (bmpData->m_pixmap)
+ PixmapToPixbuf(bmpData->m_pixmap, bmpData->m_pixbuf, w, h);
+ if (mask)
+ MaskToAlpha(mask, bmpData->m_pixbuf, w, h);
+ return bmpData->m_pixbuf;
+#endif
}
-void wxBitmap::SetPixbuf( GdkPixbuf *pixbuf )
+#ifndef __WXGTK3__
+bool wxBitmap::HasPixbuf() const
{
- if (!m_refData)
- m_refData = new wxBitmapRefData();
+ wxCHECK_MSG( IsOk(), false, wxT("invalid bitmap") );
- M_BMPDATA->m_pixbuf = pixbuf;
- PurgeOtherRepresentations(Pixbuf);
+ return M_BMPDATA->m_pixbuf != NULL;
}
void wxBitmap::PurgeOtherRepresentations(wxBitmap::Representation keep)
M_BMPDATA->m_pixmap = NULL;
}
}
+#endif
+#ifdef wxHAS_RAW_BITMAP
void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)
{
- if (bpp != 32)
- return NULL;
-
+ void* bits = NULL;
+#ifdef __WXGTK3__
+ GdkPixbuf* pixbuf = GetPixbufNoMask();
+ if ((bpp == 32) == (gdk_pixbuf_get_has_alpha(pixbuf) != 0))
+ {
+ bits = gdk_pixbuf_get_pixels(pixbuf);
+ wxBitmapRefData* bmpData = M_BMPDATA;
+ data.m_width = bmpData->m_width;
+ data.m_height = bmpData->m_height;
+ data.m_stride = gdk_pixbuf_get_rowstride(pixbuf);
+ if (bmpData->m_pixbufMask)
+ {
+ g_object_unref(bmpData->m_pixbufMask);
+ bmpData->m_pixbufMask = NULL;
+ }
+ if (bmpData->m_surface)
+ {
+ cairo_surface_destroy(bmpData->m_surface);
+ bmpData->m_surface = NULL;
+ }
+ }
+#else
GdkPixbuf *pixbuf = GetPixbuf();
- if (!pixbuf)
- return NULL;
+ const bool hasAlpha = HasAlpha();
-#if 0
- if (gdk_pixbuf_get_has_alpha( pixbuf ))
- wxPrintf( wxT("Has alpha\n") );
- else
- wxPrintf( wxT("No alpha.\n") );
+ // allow access if bpp is valid and matches existence of alpha
+ if ( pixbuf && ((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);
+ }
#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 );
+ return bits;
}
void wxBitmap::UngetRawData(wxPixelDataBase& WXUNUSED(data))
{
}
-
+#endif // wxHAS_RAW_BITMAP
bool wxBitmap::HasAlpha() const
{
- return HasPixbuf();
-}
-
-void wxBitmap::UseAlpha()
-{
- GetPixbuf();
-}
-
-//-----------------------------------------------------------------------------
-// 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;
+ const wxBitmapRefData* bmpData = M_BMPDATA;
+#ifdef __WXGTK3__
+ return bmpData && bmpData->m_bpp == 32;
+#else
+ return bmpData && (bmpData->m_alphaRequested ||
+ (bmpData->m_pixbuf && gdk_pixbuf_get_has_alpha(bmpData->m_pixbuf)));
+#endif
}
-bool wxBitmapHandler::LoadFile(wxBitmap * WXUNUSED(bitmap),
- const wxString& WXUNUSED(name),
- long WXUNUSED(flags),
- int WXUNUSED(desiredWidth),
- int WXUNUSED(desiredHeight))
+wxGDIRefData* wxBitmap::CreateGDIRefData() const
{
- wxFAIL_MSG( _T("not implemented") );
-
- return false;
+ return new wxBitmapRefData(0, 0, 0);
}
-bool wxBitmapHandler::SaveFile(const wxBitmap * WXUNUSED(bitmap),
- const wxString& WXUNUSED(name),
- int WXUNUSED(type),
- const wxPalette * WXUNUSED(palette))
+wxGDIRefData* wxBitmap::CloneGDIRefData(const wxGDIRefData* data) const
{
- wxFAIL_MSG( _T("not implemented") );
+ const wxBitmapRefData* oldRef = static_cast<const wxBitmapRefData*>(data);
+ wxBitmapRefData * const newRef = new wxBitmapRefData(oldRef->m_width,
+ oldRef->m_height,
+ oldRef->m_bpp);
+#ifdef __WXGTK3__
+ if (oldRef->m_pixbufNoMask)
+ newRef->m_pixbufNoMask = gdk_pixbuf_copy(oldRef->m_pixbufNoMask);
+ if (oldRef->m_surface)
+ {
+ const int w = oldRef->m_width;
+ const int h = oldRef->m_height;
+ cairo_surface_t* surface = cairo_image_surface_create(
+ cairo_image_surface_get_format(oldRef->m_surface), w, h);
+ newRef->m_surface = surface;
+ cairo_surface_flush(oldRef->m_surface);
+ const guchar* src = cairo_image_surface_get_data(oldRef->m_surface);
+ guchar* dst = cairo_image_surface_get_data(surface);
+ const int stride = cairo_image_surface_get_stride(surface);
+ wxASSERT(stride == cairo_image_surface_get_stride(oldRef->m_surface));
+ memcpy(dst, src, stride * h);
+ cairo_surface_mark_dirty(surface);
+ }
+#else
+ if (oldRef->m_pixmap != NULL)
+ {
+ newRef->m_pixmap = gdk_pixmap_new(
+ oldRef->m_pixmap, oldRef->m_width, oldRef->m_height,
+ // use pixmap depth, m_bpp may not match
+ gdk_drawable_get_depth(oldRef->m_pixmap));
+ wxGtkObject<GdkGC> gc(gdk_gc_new(newRef->m_pixmap));
+ gdk_draw_drawable(
+ newRef->m_pixmap, gc, oldRef->m_pixmap, 0, 0, 0, 0, -1, -1);
+ }
+ if (oldRef->m_pixbuf != NULL)
+ {
+ newRef->m_pixbuf = gdk_pixbuf_copy(oldRef->m_pixbuf);
+ }
+#endif
+ if (oldRef->m_mask != NULL)
+ {
+ newRef->m_mask = new wxMask(*oldRef->m_mask);
+ }
- return false;
+ return newRef;
}
/* static */ void wxBitmap::InitStandardHandlers()
projects / wxWidgets.git / blobdiff