X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fee0429537fdf467d7cbe99c60657c9ba2a436dc..e487524e492809638b7e335937c41fd432458a54:/src/gtk1/bitmap.cpp diff --git a/src/gtk1/bitmap.cpp b/src/gtk1/bitmap.cpp index acd2e490fa..f92b146377 100644 --- a/src/gtk1/bitmap.cpp +++ b/src/gtk1/bitmap.cpp @@ -13,8 +13,10 @@ #include "wx/bitmap.h" #include "wx/icon.h" +#include "wx/filefn.h" #include "gdk/gdkprivate.h" #include "gdk/gdkx.h" +#include "wx/image.h" //----------------------------------------------------------------------------- // wxMask @@ -24,7 +26,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxMask,wxObject) wxMask::wxMask(void) { - m_bitmap = (GdkBitmap *) NULL; + m_bitmap = (GdkBitmap *) NULL; } wxMask::wxMask( const wxBitmap& WXUNUSED(bitmap), const wxColour& WXUNUSED(colour) ) @@ -41,12 +43,12 @@ wxMask::wxMask( const wxBitmap& WXUNUSED(bitmap) ) wxMask::~wxMask(void) { - if (m_bitmap) gdk_bitmap_unref( m_bitmap ); + if (m_bitmap) gdk_bitmap_unref( m_bitmap ); } GdkBitmap *wxMask::GetBitmap(void) const { - return m_bitmap; + return m_bitmap; } //----------------------------------------------------------------------------- @@ -55,37 +57,36 @@ GdkBitmap *wxMask::GetBitmap(void) const class wxBitmapRefData: public wxObjectRefData { - public: - - wxBitmapRefData(void); - ~wxBitmapRefData(void); - - GdkPixmap *m_pixmap; - GdkBitmap *m_bitmap; - wxMask *m_mask; - int m_width; - int m_height; - int m_bpp; - wxPalette *m_palette; +public: + wxBitmapRefData(void); + ~wxBitmapRefData(void); + + GdkPixmap *m_pixmap; + GdkBitmap *m_bitmap; + wxMask *m_mask; + int m_width; + int m_height; + int m_bpp; + wxPalette *m_palette; }; wxBitmapRefData::wxBitmapRefData(void) { - m_pixmap = (GdkPixmap *) NULL; - m_bitmap = (GdkBitmap *) NULL; - m_mask = (wxMask *) NULL; - m_width = 0; - m_height = 0; - m_bpp = 0; - m_palette = (wxPalette *) NULL; + m_pixmap = (GdkPixmap *) NULL; + m_bitmap = (GdkBitmap *) NULL; + m_mask = (wxMask *) NULL; + m_width = 0; + m_height = 0; + m_bpp = 0; + m_palette = (wxPalette *) NULL; } wxBitmapRefData::~wxBitmapRefData(void) { - if (m_pixmap) gdk_pixmap_unref( m_pixmap ); - if (m_bitmap) gdk_bitmap_unref( m_bitmap ); - if (m_mask) delete m_mask; - if (m_palette) delete m_palette; + if (m_pixmap) gdk_pixmap_unref( m_pixmap ); + if (m_bitmap) gdk_bitmap_unref( m_bitmap ); + if (m_mask) delete m_mask; + if (m_palette) delete m_palette; } //----------------------------------------------------------------------------- @@ -96,462 +97,529 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmap,wxGDIObject) wxBitmap::wxBitmap(void) { - if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this); + if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this); } wxBitmap::wxBitmap( int width, int height, int depth ) { - wxCHECK_RET( (width > 0) && (height > 0), "invalid bitmap size" ) - wxCHECK_RET( (depth > 0) || (depth == -1), "invalid bitmap depth" ) + wxCHECK_RET( (width > 0) && (height > 0), "invalid bitmap size" ) + wxCHECK_RET( (depth > 0) || (depth == -1), "invalid bitmap depth" ) - m_refData = new wxBitmapRefData(); + m_refData = new wxBitmapRefData(); - GdkWindow *parent = (GdkWindow*) &gdk_root_parent; + GdkWindow *parent = (GdkWindow*) &gdk_root_parent; - M_BMPDATA->m_mask = (wxMask *) NULL; - M_BMPDATA->m_pixmap = gdk_pixmap_new( parent, width, height, depth ); - M_BMPDATA->m_width = width; - M_BMPDATA->m_height = height; - M_BMPDATA->m_bpp = gdk_window_get_visual( parent )->depth; + M_BMPDATA->m_mask = (wxMask *) NULL; + M_BMPDATA->m_pixmap = gdk_pixmap_new( parent, width, height, depth ); + M_BMPDATA->m_width = width; + M_BMPDATA->m_height = height; + M_BMPDATA->m_bpp = gdk_window_get_visual( parent )->depth; - if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this); + if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this); } +wxBitmap::wxBitmap( const char **bits ) +{ + wxCHECK_RET( bits != NULL, "invalid bitmap data" ) + + m_refData = new wxBitmapRefData(); + + GdkBitmap *mask = (GdkBitmap*) NULL; + GdkWindow *parent = (GdkWindow*) &gdk_root_parent; + + M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm_d( parent, &mask, NULL, (gchar **) bits ); + + if (mask) + { + M_BMPDATA->m_mask = new wxMask(); + M_BMPDATA->m_mask->m_bitmap = mask; + } + + gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) ); + + M_BMPDATA->m_bpp = gdk_window_get_visual( parent )->depth; // ? + if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this); +} + wxBitmap::wxBitmap( char **bits ) { - wxCHECK_RET( bits != NULL, "invalid bitmap data" ) + wxCHECK_RET( bits != NULL, "invalid bitmap data" ) - m_refData = new wxBitmapRefData(); + m_refData = new wxBitmapRefData(); - GdkBitmap *mask = (GdkBitmap*) NULL; - GdkWindow *parent = (GdkWindow*) &gdk_root_parent; + GdkBitmap *mask = (GdkBitmap*) NULL; + GdkWindow *parent = (GdkWindow*) &gdk_root_parent; - M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm_d( parent, &mask, NULL, (gchar **) bits ); + M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm_d( parent, &mask, NULL, (gchar **) bits ); + + wxCHECK_RET( M_BMPDATA->m_pixmap, "couldn't create pixmap" ); - if (mask) - { - M_BMPDATA->m_mask = new wxMask(); - M_BMPDATA->m_mask->m_bitmap = mask; - } + if (mask) + { + M_BMPDATA->m_mask = new wxMask(); + M_BMPDATA->m_mask->m_bitmap = mask; + } - gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) ); + gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) ); - M_BMPDATA->m_bpp = gdk_window_get_visual( parent )->depth; // ? - - if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this); + M_BMPDATA->m_bpp = gdk_window_get_visual( parent )->depth; // ? + if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this); } wxBitmap::wxBitmap( const wxBitmap& bmp ) { - Ref( bmp ); + Ref( bmp ); - if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this); + if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this); } wxBitmap::wxBitmap( const wxBitmap* bmp ) { - if (bmp) Ref( *bmp ); + if (bmp) Ref( *bmp ); - if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this); + if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this); } wxBitmap::wxBitmap( const wxString &filename, int type ) { - LoadFile( filename, type ); + LoadFile( filename, type ); - if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this); + if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this); } wxBitmap::wxBitmap( const char bits[], int width, int height, int WXUNUSED(depth)) { - m_refData = new wxBitmapRefData(); + m_refData = new wxBitmapRefData(); - M_BMPDATA->m_mask = (wxMask *) NULL; - M_BMPDATA->m_bitmap = - gdk_bitmap_create_from_data( (GdkWindow*) &gdk_root_parent, (gchar *) bits, width, height ); - M_BMPDATA->m_width = width; - M_BMPDATA->m_height = height; - M_BMPDATA->m_bpp = 1; + M_BMPDATA->m_mask = (wxMask *) NULL; + M_BMPDATA->m_bitmap = + gdk_bitmap_create_from_data( (GdkWindow*) &gdk_root_parent, (gchar *) bits, width, height ); + M_BMPDATA->m_width = width; + M_BMPDATA->m_height = height; + M_BMPDATA->m_bpp = 1; - if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this); + wxCHECK_RET( M_BMPDATA->m_bitmap, "couldn't create bitmap" ); + + if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this); } wxBitmap::~wxBitmap(void) { - if (wxTheBitmapList) wxTheBitmapList->DeleteObject(this); + if (wxTheBitmapList) wxTheBitmapList->DeleteObject(this); } wxBitmap& wxBitmap::operator = ( const wxBitmap& bmp ) { - if (*this == bmp) return (*this); - Ref( bmp ); - return *this; + if (*this == bmp) return (*this); + Ref( bmp ); + return *this; } bool wxBitmap::operator == ( const wxBitmap& bmp ) { - return m_refData == bmp.m_refData; + return m_refData == bmp.m_refData; } bool wxBitmap::operator != ( const wxBitmap& bmp ) { - return m_refData != bmp.m_refData; + return m_refData != bmp.m_refData; } bool wxBitmap::Ok(void) const { - return (m_refData != NULL); + return (m_refData != NULL); } int wxBitmap::GetHeight(void) const { - if (!Ok()) - { - wxFAIL_MSG( "invalid bitmap" ); - return -1; - } + wxCHECK_MSG( Ok(), -1, "invalid bitmap" ); - return M_BMPDATA->m_height; + return M_BMPDATA->m_height; } int wxBitmap::GetWidth(void) const { - if (!Ok()) - { - wxFAIL_MSG( "invalid bitmap" ); - return -1; - } + wxCHECK_MSG( Ok(), -1, "invalid bitmap" ); - return M_BMPDATA->m_width; + return M_BMPDATA->m_width; } int wxBitmap::GetDepth(void) const { - if (!Ok()) - { - wxFAIL_MSG( "invalid bitmap" ); - return -1; - } + wxCHECK_MSG( Ok(), -1, "invalid bitmap" ); - return M_BMPDATA->m_bpp; + return M_BMPDATA->m_bpp; } -void wxBitmap::SetHeight( int height ) +wxMask *wxBitmap::GetMask(void) const { - if (!Ok()) return; - - wxFAIL_MSG( "wxBitmap::SetHeight not implemented" ); + wxCHECK_MSG( Ok(), (wxMask *) NULL, "invalid bitmap" ); - M_BMPDATA->m_height = height; + return M_BMPDATA->m_mask; } -void wxBitmap::SetWidth( int width ) +void wxBitmap::SetMask( wxMask *mask ) { - if (!Ok()) return; + wxCHECK_RET( Ok(), "invalid bitmap" ); - wxFAIL_MSG( "wxBitmap::SetWidth not implemented" ); + if (M_BMPDATA->m_mask) delete M_BMPDATA->m_mask; - M_BMPDATA->m_width = width; + M_BMPDATA->m_mask = mask; } -void wxBitmap::SetDepth( int depth ) +bool wxBitmap::SaveFile( const wxString &name, int type, wxPalette *WXUNUSED(palette) ) { - if (!Ok()) return; - - wxFAIL_MSG( "wxBitmap::SetDepth not implemented" ); + wxCHECK_MSG( Ok(), FALSE, "invalid bitmap" ); - M_BMPDATA->m_bpp = depth; + if (type == wxBITMAP_TYPE_PNG) + { + wxImage image( *this ); + if (image.Ok()) return image.SaveFile( name, type ); + } + + return FALSE; } -wxMask *wxBitmap::GetMask(void) const +bool wxBitmap::LoadFile( const wxString &name, int type ) { - if (!Ok()) - { - wxFAIL_MSG( "invalid bitmap" ); - return (wxMask *) NULL; - } + UnRef(); + + if (!wxFileExists(name)) return FALSE; - return M_BMPDATA->m_mask; + if (type == wxBITMAP_TYPE_XPM) + { + m_refData = new wxBitmapRefData(); + + GdkBitmap *mask = (GdkBitmap*) NULL; + GdkWindow *parent = (GdkWindow*) &gdk_root_parent; + + M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm( parent, &mask, NULL, name ); + + if (mask) + { + M_BMPDATA->m_mask = new wxMask(); + M_BMPDATA->m_mask->m_bitmap = mask; + } + + gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) ); + M_BMPDATA->m_bpp = gdk_window_get_visual( parent )->depth; + } + else if (type == wxBITMAP_TYPE_PNG) + { + wxImage image; + image.LoadFile( name, type ); + if (image.Ok()) *this = image.ConvertToBitmap(); + } + else if (type == wxBITMAP_TYPE_BMP) + { + wxImage image; + image.LoadFile( name, type ); + if (image.Ok()) *this = image.ConvertToBitmap(); + } + else + return FALSE; + + return TRUE; +} + +wxPalette *wxBitmap::GetPalette(void) const +{ + if (!Ok()) return (wxPalette *) NULL; + + return M_BMPDATA->m_palette; } -void wxBitmap::SetMask( wxMask *mask ) +void wxBitmap::SetHeight( int height ) { - if (!Ok()) - { - wxFAIL_MSG( "invalid bitmap" ); - return; - } - - if (M_BMPDATA->m_mask) delete M_BMPDATA->m_mask; - - M_BMPDATA->m_mask = mask; + if (!m_refData) m_refData = new wxBitmapRefData(); + + M_BMPDATA->m_height = height; } -bool wxBitmap::SaveFile( const wxString &WXUNUSED(name), int WXUNUSED(type), - wxPalette *WXUNUSED(palette) ) +void wxBitmap::SetWidth( int width ) { - if (!Ok()) - { - wxFAIL_MSG( "invalid bitmap" ); - return FALSE; - } - - return FALSE; + if (!m_refData) m_refData = new wxBitmapRefData(); + + M_BMPDATA->m_width = width; } -bool wxBitmap::LoadFile( const wxString &WXUNUSED(name), int WXUNUSED(type) ) +void wxBitmap::SetDepth( int depth ) { - if (!Ok()) - { - wxFAIL_MSG( "invalid bitmap" ); - return FALSE; - } - - return FALSE; + if (!m_refData) m_refData = new wxBitmapRefData(); + + M_BMPDATA->m_bpp = depth; } - -wxPalette *wxBitmap::GetPalette(void) const + +void wxBitmap::SetPixmap( GdkPixmap *pixmap ) { - if (!Ok()) return (wxPalette *) NULL; - return M_BMPDATA->m_palette; + if (!m_refData) m_refData = new wxBitmapRefData(); + + M_BMPDATA->m_pixmap = pixmap; } GdkPixmap *wxBitmap::GetPixmap(void) const { - if (!Ok()) - { - wxFAIL_MSG( "invalid bitmap" ); - return (GdkPixmap *) NULL; - } + wxCHECK_MSG( Ok(), (GdkPixmap *) NULL, "invalid bitmap" ); - return M_BMPDATA->m_pixmap; + return M_BMPDATA->m_pixmap; } GdkBitmap *wxBitmap::GetBitmap(void) const { - if (!Ok()) - { - wxFAIL_MSG( "invalid bitmap" ); - return (GdkBitmap *) NULL; - } + wxCHECK_MSG( Ok(), (GdkBitmap *) NULL, "invalid bitmap" ); - return M_BMPDATA->m_bitmap; + return M_BMPDATA->m_bitmap; } -wxBitmap::wxBitmap( const wxImage &image ) +//----------------------------------------------------------------------------- +// wxImage +//----------------------------------------------------------------------------- + +wxBitmap wxImage::ConvertToBitmap() const { - if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this); - - if (!image.Ok()) return; + wxBitmap bitmap; - m_refData = new wxBitmapRefData(); + wxCHECK_MSG( Ok(), bitmap, "invalid image" ); - M_BMPDATA->m_height = image.GetHeight(); - M_BMPDATA->m_width = image.GetWidth(); - int width = image.GetWidth(); - int height = image.GetHeight(); + int width = GetWidth(); + int height = GetHeight(); - // Create picture + bitmap.SetHeight( height ); + bitmap.SetWidth( width ); + + // Create picture - GdkImage *data_image = - gdk_image_new( GDK_IMAGE_FASTEST, gdk_visual_get_system(), width, height ); + GdkImage *data_image = + gdk_image_new( GDK_IMAGE_FASTEST, gdk_visual_get_system(), width, height ); - M_BMPDATA->m_pixmap = - gdk_pixmap_new( (GdkWindow*)&gdk_root_parent, width, height, -1 ); + bitmap.SetPixmap( gdk_pixmap_new( (GdkWindow*)&gdk_root_parent, width, height, -1 ) ); - // Create mask - - GdkImage *mask_image = (GdkImage*) NULL; + // Create mask - if (image.HasMask()) - { - unsigned char *mask_data = (unsigned char*)malloc( ((width >> 3)+8) * height ); + GdkImage *mask_image = (GdkImage*) NULL; - mask_image = gdk_image_new_bitmap( gdk_visual_get_system(), mask_data, width, height ); - - M_BMPDATA->m_mask = new wxMask(); - M_BMPDATA->m_mask->m_bitmap = gdk_pixmap_new( (GdkWindow*)&gdk_root_parent, width, height, 1 ); - } + if (HasMask()) + { + unsigned char *mask_data = (unsigned char*)malloc( ((width >> 3)+8) * height ); - // Retrieve depth + mask_image = gdk_image_new_bitmap( gdk_visual_get_system(), mask_data, width, height ); - M_BMPDATA->m_bpp = data_image->depth; + wxMask *mask = new wxMask(); + mask->m_bitmap = gdk_pixmap_new( (GdkWindow*)&gdk_root_parent, width, height, 1 ); + + bitmap.SetMask( mask ); + } - int render_depth = 8; - if (M_BMPDATA->m_bpp > 8) render_depth = M_BMPDATA->m_bpp; + // Retrieve depth - // Render + GdkVisual *visual = gdk_window_get_visual( bitmap.GetPixmap() ); + if (visual == NULL) visual = gdk_window_get_visual( (GdkWindow*) &gdk_root_parent ); + int bpp = visual->depth; + if ((bpp == 16) && (visual->red_mask != 0xf800)) bpp = 15; + if (bpp < 8) bpp = 8; + + // Render - enum byte_order { RGB, RBG, BRG, BGR, GRB, GBR }; - byte_order b_o; + enum byte_order { RGB, RBG, BRG, BGR, GRB, GBR }; + byte_order b_o = RGB; - if (render_depth >= 24) - { - GdkVisual *visual = gdk_visual_get_system(); - 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 = RGB; - 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; - } + if (bpp >= 24) + { + GdkVisual *visual = gdk_visual_get_system(); + 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 = RGB; + 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; + } - int r_mask = image.GetMaskRed(); - int g_mask = image.GetMaskGreen(); - int b_mask = image.GetMaskBlue(); + int r_mask = GetMaskRed(); + int g_mask = GetMaskGreen(); + int b_mask = GetMaskBlue(); - unsigned char* data = image.GetData(); + unsigned char* data = 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++; + 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, 0 ); - else - gdk_image_put_pixel( mask_image, x, y, 1 ); - } + if (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 ); + } - switch (render_depth) - { - case 8: - { - GdkColormap *cmap = gtk_widget_get_default_colormap(); - GdkColor *colors = cmap->colors; - int max = 3 * (65536); - int index = -1; - - 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) { index = i; max = sum; } - } + switch (bpp) + { + case 8: + { + GdkColormap *cmap = gtk_widget_get_default_colormap(); + GdkColor *colors = cmap->colors; + int max = 3 * (65536); + int index = -1; + + 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) { index = i; max = sum; } + } - gdk_image_put_pixel( data_image, x, y, index ); + gdk_image_put_pixel( data_image, x, y, index ); - break; - } - case 15: - { - guint32 pixel = ((r & 0xf8) << 7) | ((g & 0xf8) << 2) | ((b & 0xf8) >> 3); - gdk_image_put_pixel( data_image, x, y, pixel ); - break; - } - case 16: - { - guint32 pixel = ((r & 0xf8) << 8) | ((g & 0xfc) << 3) | ((b & 0xf8) >> 3); - 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; + break; + } + case 15: + { + guint32 pixel = ((r & 0xf8) << 7) | ((g & 0xf8) << 2) | ((b & 0xf8) >> 3); + gdk_image_put_pixel( data_image, x, y, pixel ); + break; + } + case 16: + { + guint32 pixel = ((r & 0xf8) << 8) | ((g & 0xfc) << 3) | ((b & 0xf8) >> 3); + 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 ); + } + default: break; } - gdk_image_put_pixel( data_image, x, y, pixel ); - } - default: break; - } - } - - // Blit picture + } // for + } // for + + // Blit picture - GdkGC *data_gc = gdk_gc_new( M_BMPDATA->m_pixmap ); + GdkGC *data_gc = gdk_gc_new( bitmap.GetPixmap() ); - gdk_draw_image( M_BMPDATA->m_pixmap, data_gc, data_image, 0, 0, 0, 0, width, height ); + gdk_draw_image( bitmap.GetPixmap(), data_gc, data_image, 0, 0, 0, 0, width, height ); - gdk_image_destroy( data_image ); - gdk_gc_unref( data_gc ); + gdk_image_destroy( data_image ); + gdk_gc_unref( data_gc ); - // Blit mask + // Blit mask - if (image.HasMask()) - { - GdkGC *mask_gc = gdk_gc_new( M_BMPDATA->m_mask->m_bitmap ); + if (HasMask()) + { + GdkGC *mask_gc = gdk_gc_new( bitmap.GetMask()->GetBitmap() ); - gdk_draw_image( M_BMPDATA->m_mask->m_bitmap, mask_gc, mask_image, 0, 0, 0, 0, width, height ); + gdk_draw_image( bitmap.GetMask()->GetBitmap(), mask_gc, mask_image, 0, 0, 0, 0, width, height ); - gdk_image_destroy( mask_image ); - gdk_gc_unref( mask_gc ); - } - + gdk_image_destroy( mask_image ); + gdk_gc_unref( mask_gc ); + } + + return bitmap; } -wxImage wxBitmap::ConvertToImage() const +wxImage::wxImage( const wxBitmap &bitmap ) { - wxImage image; - - if (!Ok()) - { - wxFAIL_MSG( "invalid bitmap" ); - return image; - } - - GdkImage *gdk_image = gdk_image_get( M_BMPDATA->m_pixmap, 0, 0, M_BMPDATA->m_width, M_BMPDATA->m_height ); + wxCHECK_RET( bitmap.Ok(), "invalid bitmap" ); - if (!gdk_image) return image; + GdkImage *gdk_image = gdk_image_get( bitmap.GetPixmap(), + 0, 0, + bitmap.GetWidth(), bitmap.GetHeight() ); + + wxCHECK_RET( gdk_image, "couldn't create image" ); - image.Create( M_BMPDATA->m_width, M_BMPDATA->m_height ); - char unsigned *data = image.GetData(); + Create( bitmap.GetWidth(), bitmap.GetHeight() ); + char unsigned *data = GetData(); + + if (!data) + { + gdk_image_destroy( gdk_image ); + wxFAIL_MSG( "couldn't create image" ); + return; + } + + GdkImage *gdk_image_mask = (GdkImage*) NULL; + if (bitmap.GetMask()) + { + gdk_image_mask = gdk_image_get( bitmap.GetMask()->GetBitmap(), + 0, 0, + bitmap.GetWidth(), bitmap.GetHeight() ); + + SetMaskColour( 16, 16, 16 ); // anything unlikely and dividable + } - int bpp = gdk_image->bpp; - GdkColormap *cmap = gtk_widget_get_default_colormap(); + GdkVisual *visual = gdk_window_get_visual( bitmap.GetPixmap() ); + if (visual == NULL) visual = gdk_window_get_visual( (GdkWindow*) &gdk_root_parent ); + int bpp = visual->depth; + if ((bpp == 16) && (visual->red_mask != 0xf800)) bpp = 15; + + GdkColormap *cmap = gtk_widget_get_default_colormap(); - long pos = 0; - for (int j = 0; j < M_BMPDATA->m_height; j++) - { - for (int i = 0; i < M_BMPDATA->m_width; i++) + long pos = 0; + for (int j = 0; j < bitmap.GetHeight(); j++) { - int pixel = gdk_image_get_pixel( gdk_image, i, j ); - if (bpp <= 8) - { - 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 (bpp == 15) - { - data[pos] = (pixel >> 7) & 0xf8; - data[pos+1] = (pixel >> 3) & 0xf8; - data[pos+2] = (pixel << 3) & 0xf8; - } else if (bpp == 16) - { - data[pos] = (pixel >> 8) & 0xf8; - data[pos+1] = (pixel >> 3) & 0xfc; - data[pos+2] = (pixel << 3) & 0xf8; - } else - { - data[pos] = (pixel >> 16) & 0xff; - data[pos+1] = (pixel >> 8) & 0xff; - data[pos+2] = pixel & 0xff; - } + for (int i = 0; i < bitmap.GetWidth(); i++) + { + int pixel = gdk_image_get_pixel( gdk_image, i, j ); + if (bpp <= 8) + { + 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 (bpp == 15) + { + data[pos] = (pixel >> 7) & 0xf8; + data[pos+1] = (pixel >> 2) & 0xf8; + data[pos+2] = (pixel << 3) & 0xf8; + } else if (bpp == 16) + { + data[pos] = (pixel >> 8) & 0xf8; + data[pos+1] = (pixel >> 3) & 0xfc; + data[pos+2] = (pixel << 3) & 0xf8; + } else + { + data[pos] = (pixel >> 16) & 0xff; + data[pos+1] = (pixel >> 8) & 0xff; + data[pos+2] = pixel & 0xff; + } - pos += 3; + if (gdk_image_mask) + { + int mask_pixel = gdk_image_get_pixel( gdk_image_mask, i, j ); + if (mask_pixel == 0) + { + data[pos] = 16; + data[pos+1] = 16; + data[pos+2] = 16; + } + } + + pos += 3; + } } - } - - gdk_image_destroy( gdk_image ); - return image; + gdk_image_destroy( gdk_image ); + if (gdk_image_mask) gdk_image_destroy( gdk_image_mask ); }