X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9e691f46b2ec1b5dbbff2e51131e3c532e688a89..8691eeba23b7e494564a183bf19b09cfe47caa01:/src/gtk/bitmap.cpp?ds=sidebyside diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp index 0a27495252..05f616edce 100644 --- a/src/gtk/bitmap.cpp +++ b/src/gtk/bitmap.cpp @@ -7,10 +7,13 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "bitmap.h" #endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + #include "wx/defs.h" #include "wx/palette.h" @@ -33,10 +36,7 @@ #ifdef __WXGTK20__ #include #else // GTK+ 1.2 - // VZ: is this still needed? seems to compile fine without it... - #if (GTK_MINOR_VERSION > 0) - #include - #endif + #include #endif // GTK+ 2.0/1.2 extern void gdk_wx_draw_bitmap (GdkDrawable *drawable, @@ -99,7 +99,7 @@ bool wxMask::Create( const wxBitmap& bitmap, m_bitmap = (GdkBitmap*) NULL; } - wxImage image( bitmap ); + wxImage image = bitmap.ConvertToImage(); if (!image.Ok()) return FALSE; m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, image.GetWidth(), image.GetHeight(), 1 ); @@ -124,20 +124,21 @@ bool wxMask::Create( const wxBitmap& bitmap, GdkVisual *visual = wxTheApp->GetGdkVisual(); int bpp = visual->depth; - if ((bpp == 16) && (visual->red_mask != 0xf800)) bpp = 15; + 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) + } + else if (bpp == 16) { red = red & 0xf8; green = green & 0xfc; blue = blue & 0xf8; - } else - if (bpp == 12) + } + else if (bpp == 12) { red = red & 0xf0; green = green & 0xf0; @@ -256,10 +257,12 @@ wxBitmapRefData::wxBitmapRefData() wxBitmapRefData::~wxBitmapRefData() { - 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 ); + delete m_mask; + delete m_palette; } //----------------------------------------------------------------------------- @@ -281,14 +284,18 @@ bool wxBitmap::Create( int width, int height, int depth ) { UnRef(); - wxCHECK_MSG( (width > 0) && (height > 0), FALSE, wxT("invalid bitmap size") ) + if ( width <= 0 || height <= 0 ) + { + return false; + } GdkVisual *visual = wxTheApp->GetGdkVisual(); - if (depth == -1) depth = visual->depth; + if (depth == -1) + depth = visual->depth; - wxCHECK_MSG( (depth == visual->depth) || - (depth == 1), FALSE, wxT("invalid bitmap depth") ) + wxCHECK_MSG( (depth == visual->depth) || (depth == 1), FALSE, + wxT("invalid bitmap depth") ) m_refData = new wxBitmapRefData(); M_BMPDATA->m_mask = (wxMask *) NULL; @@ -332,7 +339,7 @@ bool wxBitmap::CreateFromXpm( const char **bits ) gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) ); - M_BMPDATA->m_bpp = visual->depth; // ? + M_BMPDATA->m_bpp = visual->depth; // Can we get a different depth from create_from_xpm_d() ? return TRUE; } @@ -344,19 +351,24 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) wxCHECK_MSG( image.Ok(), FALSE, wxT("invalid image") ) wxCHECK_MSG( depth == -1 || depth == 1, FALSE, wxT("invalid bitmap depth") ) + int width = image.GetWidth(); + int height = image.GetHeight(); + + if ( width <= 0 || height <= 0 ) + { + return false; + } + m_refData = new wxBitmapRefData(); + SetHeight( height ); + SetWidth( width ); + // ------ - // convertion to mono bitmap: + // conversion to mono bitmap: // ------ if (depth == 1) { - int width = image.GetWidth(); - int height = image.GetHeight(); - - SetHeight( height ); - SetWidth( width ); - SetBitmap( gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 ) ); SetDepth( 1 ); @@ -443,16 +455,10 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) } // ------ - // convertion to colour bitmap: + // conversion to colour bitmap: // ------ else { - 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(); @@ -461,10 +467,12 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) SetDepth( bpp ); - if ((bpp == 16) && (visual->red_mask != 0xf800)) bpp = 15; - if (bpp < 8) bpp = 8; + 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 + // 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 @@ -571,7 +579,7 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) 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; @@ -581,9 +589,9 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) if (sum < max) { pixel = i; max = sum; } } } - + gdk_image_put_pixel( data_image, x, y, pixel ); - + break; } case 12: // SGI only @@ -680,6 +688,13 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth ) wxImage wxBitmap::ConvertToImage() const { + // 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; + wxImage image; wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") ); @@ -688,15 +703,16 @@ wxImage wxBitmap::ConvertToImage() const if (GetPixmap()) { gdk_image = gdk_image_get( GetPixmap(), - 0, 0, - GetWidth(), GetHeight() ); - } else - if (GetBitmap()) + 0, 0, + GetWidth(), GetHeight() ); + } + else if (GetBitmap()) { gdk_image = gdk_image_get( GetBitmap(), - 0, 0, - GetWidth(), GetHeight() ); - } else + 0, 0, + GetWidth(), GetHeight() ); + } + else { wxFAIL_MSG( wxT("Ill-formed bitmap") ); } @@ -717,10 +733,10 @@ wxImage wxBitmap::ConvertToImage() const if (GetMask()) { gdk_image_mask = gdk_image_get( GetMask()->GetBitmap(), - 0, 0, - GetWidth(), GetHeight() ); + 0, 0, + GetWidth(), GetHeight() ); - image.SetMaskColour( 16, 16, 16 ); // anything unlikely and dividable + image.SetMaskColour( MASK_RED, MASK_GREEN, MASK_BLUE ); } int bpp = -1; @@ -737,9 +753,10 @@ wxImage wxBitmap::ConvertToImage() const GdkVisual *visual = gdk_window_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; + 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; @@ -800,9 +817,15 @@ wxImage wxBitmap::ConvertToImage() const 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; + 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; } } @@ -817,6 +840,7 @@ wxImage wxBitmap::ConvertToImage() const } wxBitmap::wxBitmap( const wxBitmap& bmp ) + : wxGDIObject() { Ref( bmp ); } @@ -828,16 +852,24 @@ wxBitmap::wxBitmap( const wxString &filename, int type ) wxBitmap::wxBitmap( const char bits[], int width, int height, int WXUNUSED(depth)) { - m_refData = new wxBitmapRefData(); + 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; + 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; - wxCHECK_RET( M_BMPDATA->m_bitmap, wxT("couldn't create bitmap") ); + wxASSERT_MSG( M_BMPDATA->m_bitmap, wxT("couldn't create bitmap") ); + } } wxBitmap::~wxBitmap() @@ -954,7 +986,7 @@ bool wxBitmap::SaveFile( const wxString &name, int type, wxPalette *WXUNUSED(pal // Try to save the bitmap via wxImage handlers: { - wxImage image( *this ); + wxImage image = ConvertToImage(); if (image.Ok()) return image.SaveFile( name, type ); } @@ -965,7 +997,8 @@ bool wxBitmap::LoadFile( const wxString &name, int type ) { UnRef(); - if (!wxFileExists(name)) return FALSE; + if (!wxFileExists(name)) + return FALSE; GdkVisual *visual = wxTheApp->GetGdkVisual(); @@ -975,7 +1008,13 @@ bool wxBitmap::LoadFile( const wxString &name, int type ) GdkBitmap *mask = (GdkBitmap*) NULL; - M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm( wxGetRootWindow()->window, &mask, NULL, name.fn_str() ); + M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm + ( + wxGetRootWindow()->window, + &mask, + NULL, + name.fn_str() + ); if (mask) { @@ -990,9 +1029,10 @@ bool wxBitmap::LoadFile( const wxString &name, int type ) else // try if wxImage can load it { wxImage image; - if (!image.LoadFile( name, type )) return FALSE; - if (image.Ok()) *this = image.ConvertToBitmap(); - else return FALSE; + if ( !image.LoadFile( name, type ) || !image.Ok() ) + return FALSE; + + *this = wxBitmap(image); } return TRUE; @@ -1000,42 +1040,48 @@ bool wxBitmap::LoadFile( const wxString &name, int type ) wxPalette *wxBitmap::GetPalette() const { - if (!Ok()) return (wxPalette *) NULL; + if (!Ok()) + return (wxPalette *) NULL; return M_BMPDATA->m_palette; } void wxBitmap::SetHeight( int height ) { - if (!m_refData) m_refData = new wxBitmapRefData(); + if (!m_refData) + m_refData = new wxBitmapRefData(); M_BMPDATA->m_height = height; } void wxBitmap::SetWidth( int width ) { - if (!m_refData) m_refData = new wxBitmapRefData(); + if (!m_refData) + m_refData = new wxBitmapRefData(); M_BMPDATA->m_width = width; } void wxBitmap::SetDepth( int depth ) { - if (!m_refData) m_refData = new wxBitmapRefData(); + if (!m_refData) + m_refData = new wxBitmapRefData(); M_BMPDATA->m_bpp = depth; } void wxBitmap::SetPixmap( GdkPixmap *pixmap ) { - if (!m_refData) m_refData = new wxBitmapRefData(); + if (!m_refData) + m_refData = new wxBitmapRefData(); M_BMPDATA->m_pixmap = pixmap; } void wxBitmap::SetBitmap( GdkPixmap *bitmap ) { - if (!m_refData) m_refData = new wxBitmapRefData(); + if (!m_refData) + m_refData = new wxBitmapRefData(); M_BMPDATA->m_bitmap = bitmap; }