/////////////////////////////////////////////////////////////////////////////
-// Name: bitmap.cpp
+// Name: src/gtk1/bitmap.cpp
// Purpose:
// Author: Robert Roebling
// RCS-ID: $Id$
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#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"
#include "wx/bitmap.h"
-#include "wx/icon.h"
-#include "wx/filefn.h"
-#include "wx/image.h"
-#include "wx/dcmemory.h"
-#include "wx/app.h"
-#ifdef __WXGTK20__
- // need this to get gdk_image_new_bitmap()
- #define GDK_ENABLE_BROKEN
-#endif
+#ifndef WX_PRECOMP
+ #include "wx/app.h"
+ #include "wx/dcmemory.h"
+ #include "wx/palette.h"
+ #include "wx/icon.h"
+ #include "wx/math.h"
+ #include "wx/image.h"
+#endif // WX_PRECOMP
+
+#include "wx/filefn.h"
#include <gdk/gdk.h>
#include <gtk/gtk.h>
#include <gdk/gdkx.h>
-#ifdef __WXGTK20__
- #include <gdk/gdkimage.h>
-#else // GTK+ 1.2
- #include <gdk/gdkrgb.h>
-#endif // GTK+ 2.0/1.2
+#include <gdk/gdkrgb.h>
-#include <math.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
+void gdk_wx_draw_bitmap (GdkDrawable *drawable,
+ GdkGC *gc,
+ GdkDrawable *src,
+ gint xsrc,
+ gint ysrc,
+ gint xdest,
+ gint ydest,
+ gint width,
+ gint height);
//-----------------------------------------------------------------------------
// data
Create( bitmap, colour );
}
+#if wxUSE_PALETTE
wxMask::wxMask( const wxBitmap& bitmap, int paletteIndex )
{
m_bitmap = (GdkBitmap *) NULL;
Create( bitmap, paletteIndex );
}
+#endif // wxUSE_PALETTE
wxMask::wxMask( const wxBitmap& bitmap )
{
}
wxImage image = bitmap.ConvertToImage();
- if (!image.Ok()) return FALSE;
+ if (!image.Ok()) return false;
m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, image.GetWidth(), image.GetHeight(), 1 );
GdkGC *gc = gdk_gc_new( m_bitmap );
gdk_gc_unref( gc );
- return TRUE;
+ 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") );
+ 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 )
{
m_bitmap = (GdkBitmap*) NULL;
}
- if (!bitmap.Ok()) return FALSE;
+ if (!bitmap.Ok()) return false;
- wxCHECK_MSG( bitmap.GetBitmap(), FALSE, wxT("Cannot create mask from colour bitmap") );
+ wxCHECK_MSG( bitmap.GetBitmap(), false, wxT("Cannot create mask from colour bitmap") );
m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, bitmap.GetWidth(), bitmap.GetHeight(), 1 );
- if (!m_bitmap) return FALSE;
+ if (!m_bitmap) return false;
GdkGC *gc = gdk_gc_new( m_bitmap );
gdk_gc_unref( gc );
- return TRUE;
+ return true;
}
GdkBitmap *wxMask::GetBitmap() const
{
public:
wxBitmapRefData();
- ~wxBitmapRefData();
+ virtual ~wxBitmapRefData();
GdkPixmap *m_pixmap;
GdkBitmap *m_bitmap;
if (m_bitmap)
gdk_bitmap_unref( m_bitmap );
delete m_mask;
+#if wxUSE_PALETTE
delete m_palette;
+#endif // wxUSE_PALETTE
}
//-----------------------------------------------------------------------------
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) || (depth == 32), false,
+ wxT("invalid bitmap depth") );
m_refData = new wxBitmapRefData();
M_BMPDATA->m_mask = (wxMask *) NULL;
return Ok();
}
-bool wxBitmap::CreateFromXpm( const char **bits )
+wxBitmap::wxBitmap(const char* const* bits)
{
- UnRef();
-
- wxCHECK_MSG( bits != NULL, FALSE, wxT("invalid bitmap data") )
+ wxCHECK2_MSG(bits != NULL, return, wxT("invalid bitmap data"));
GdkVisual *visual = wxTheApp->GetGdkVisual();
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") );
+ wxCHECK2_MSG(M_BMPDATA->m_pixmap, return, wxT("couldn't create pixmap"));
if (mask)
{
gdk_window_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() ?
-
- return TRUE;
}
wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight, int newx, int newy )
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;
+
GdkImage *img = (GdkImage*) NULL;
if (GetPixmap())
img = gdk_image_get( GetPixmap(), 0, 0, GetWidth(), GetHeight() );
wxCHECK_MSG( img, wxNullBitmap, wxT("couldn't create image") );
- wxBitmap bmp;
int bpp = -1;
- int width = wxMax(newx, 1);
- int height = wxMax(newy, 1);
- width = wxMin(width, clipwidth);
- height = wxMin(height, clipheight);
-
+
GdkGC *gc = NULL;
GdkPixmap *dstpix = NULL;
if (GetPixmap())
char *dst = NULL;
long dstbyteperline = 0;
-
+
if (GetBitmap())
{
bpp = 1;
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;
for (int h = 0; h < height; h++)
{
char outbyte = 0;
+ int old_x = -1;
+ guint32 old_pixval = 0;
- for (int w=0; w<width; w++)
+ for (int w = 0; w < width; w++)
{
- guint32 pixval = gdk_image_get_pixel( img, tablex[w], tabley[h] );
- if (bpp==1)
+ 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 (bpp == 1)
{
if (!pixval)
{
char bit=1;
- char shift = bit << w % 8;
+ char shift = bit << (w % 8);
outbyte |= shift;
}
-
+
if ((w+1)%8==0)
{
- dst[h*dstbyteperline+w/8]=~outbyte;
+ dst[h*dstbyteperline+w/8] = outbyte;
outbyte = 0;
}
}
gdk_draw_point( dstpix, gc, w, h);
}
}
-
+
// do not forget the last byte
- if (bpp == 1)
- dst[h*dstbyteperline+width/8] = ~outbyte;
+ if ((bpp == 1) && (width % 8 != 0))
+ dst[h*dstbyteperline+width/8] = outbyte;
}
-
+
gdk_image_destroy( img );
if (gc) gdk_gc_unref( gc );
bmp = wxBitmap( (const char *)dst, width, height, 1 );
free( dst );
}
-
+
if (GetMask())
{
- bpp = 1;
- dstbyteperline = width/8*bpp;
- if (width*bpp % 8 != 0)
+ 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++)
{
char outbyte = 0;
-
- for (int w=0; w<width; w++)
+ int old_x = -1;
+ guint32 old_pixval = 0;
+
+ for (int w = 0; w < width; w++)
{
- guint32 pixval = gdk_image_get_pixel( img, tablex[w], tabley[h] );
+ 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;
+ char shift = bit << (w % 8);
outbyte |= shift;
}
-
- if ((w+1)%8==0)
+
+ if ((w+1)%8 == 0)
{
- dst[h*dstbyteperline+w/8]=~outbyte;
+ dst[h*dstbyteperline+w/8] = outbyte;
outbyte = 0;
}
}
-
+
// do not forget the last byte
- if (bpp == 1)
- dst[h*dstbyteperline+width/8] = ~outbyte;
+ if (width % 8 != 0)
+ dst[h*dstbyteperline+width/8] = outbyte;
}
-
- wxBitmap mask_bmp( (const char *)dst, width, height, 1 );
- wxMask* mask = new wxMask(mask_bmp);
+ wxMask* mask = new wxMask;
+ mask->m_bitmap = gdk_bitmap_create_from_data( wxGetRootWindow()->window, (gchar *) dst, width, height );
bmp.SetMask(mask);
-
+
free( dst );
gdk_image_destroy( img );
}
free( tablex );
free( tabley );
-
- return bmp;
+
+ return bmp;
}
-bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
+bool wxBitmap::CreateFromImage(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") )
+ 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 (image.GetWidth() <= 0 || image.GetHeight() <= 0)
+ return false;
- if ( width <= 0 || height <= 0 )
+ m_refData = new wxBitmapRefData();
+
+ if (depth == 1)
{
- return false;
+ return CreateFromImageAsBitmap(image);
}
+ else
+ {
+ return CreateFromImageAsPixmap(image);
+ }
+}
- m_refData = new wxBitmapRefData();
+// conversion to mono bitmap:
+bool wxBitmap::CreateFromImageAsBitmap(const wxImage& img)
+{
+ // 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 );
- // ------
- // conversion to mono bitmap:
- // ------
- if (depth == 1)
- {
- SetBitmap( gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 ) );
+ SetBitmap( gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 ) );
- SetDepth( 1 );
+ SetDepth( 1 );
- GdkVisual *visual = wxTheApp->GetGdkVisual();
+ GdkVisual *visual = wxTheApp->GetGdkVisual();
- // Create picture image
+ // Create picture image
- unsigned char *data_data = (unsigned char*)malloc( ((width >> 3)+8) * height );
+ unsigned char *data_data = (unsigned char*)malloc( ((width >> 3)+8) * height );
- GdkImage *data_image =
- gdk_image_new_bitmap( visual, data_data, width, height );
+ GdkImage *data_image =
+ gdk_image_new_bitmap( visual, data_data, width, height );
- // Create mask image
+ // Create mask image
- GdkImage *mask_image = (GdkImage*) NULL;
+ GdkImage *mask_image = (GdkImage*) NULL;
- if (image.HasMask())
- {
- unsigned char *mask_data = (unsigned char*)malloc( ((width >> 3)+8) * height );
+ 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 );
+ 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 );
+ wxMask *mask = new wxMask();
+ mask->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 );
- SetMask( mask );
- }
+ SetMask( mask );
+ }
- int r_mask = image.GetMaskRed();
- int g_mask = image.GetMaskGreen();
- int b_mask = image.GetMaskBlue();
+ int r_mask = image.GetMaskRed();
+ int g_mask = image.GetMaskGreen();
+ int b_mask = image.GetMaskBlue();
- unsigned char* data = image.GetData();
+ unsigned char* data = image.GetData();
- int index = 0;
- for (int y = 0; y < height; y++)
+ int index = 0;
+ for (int y = 0; y < height; y++)
+ {
+ for (int x = 0; x < width; x++)
{
- 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())
{
- 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 );
+ if ((r == r_mask) && (b == b_mask) && (g == g_mask))
+ gdk_image_put_pixel( mask_image, x, y, 1 );
else
- gdk_image_put_pixel( data_image, x, y, 0 );
+ gdk_image_put_pixel( mask_image, x, y, 0 );
+ }
- } // for
- } // for
+ 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 );
- // Blit picture
+ } // for
+ } // for
- GdkGC *data_gc = gdk_gc_new( GetBitmap() );
+ // Blit picture
- gdk_draw_image( GetBitmap(), data_gc, data_image, 0, 0, 0, 0, width, height );
+ GdkGC *data_gc = gdk_gc_new( GetBitmap() );
- gdk_image_destroy( data_image );
- gdk_gc_unref( data_gc );
+ gdk_draw_image( GetBitmap(), data_gc, data_image, 0, 0, 0, 0, width, height );
- // Blit mask
+ gdk_image_destroy( data_image );
+ gdk_gc_unref( data_gc );
- if (image.HasMask())
- {
- GdkGC *mask_gc = gdk_gc_new( GetMask()->GetBitmap() );
+ // 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 );
+ gdk_draw_image( 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 );
}
- // ------
- // conversion to colour bitmap:
- // ------
- else
- {
- SetPixmap( gdk_pixmap_new( wxGetRootWindow()->window, width, height, -1 ) );
+ return true;
+}
+
+// conversion to colour bitmap:
+bool wxBitmap::CreateFromImageAsPixmap(const wxImage& img)
+{
+ // 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 );
- GdkVisual *visual = wxTheApp->GetGdkVisual();
+ SetPixmap( gdk_pixmap_new( wxGetRootWindow()->window, width, height, -1 ) );
- int bpp = visual->depth;
+ GdkVisual *visual = wxTheApp->GetGdkVisual();
- SetDepth( bpp );
+ int bpp = visual->depth;
- if ((bpp == 16) && (visual->red_mask != 0xf800))
- bpp = 15;
- else if (bpp < 8)
- bpp = 8;
+ 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.
+ // 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))
+ if (!image.HasMask() && (bpp > 16))
#else
- if (!image.HasMask() && (bpp > 12))
+ if (!image.HasMask() && (bpp > 12))
#endif
- {
- static bool s_hasInitialized = FALSE;
+ {
+ static bool s_hasInitialized = false;
- if (!s_hasInitialized)
- {
- gdk_rgb_init();
- s_hasInitialized = TRUE;
- }
+ if (!s_hasInitialized)
+ {
+ gdk_rgb_init();
+ s_hasInitialized = true;
+ }
- GdkGC *gc = gdk_gc_new( GetPixmap() );
+ GdkGC *gc = gdk_gc_new( GetPixmap() );
- gdk_draw_rgb_image( GetPixmap(),
- gc,
- 0, 0,
- width, height,
- GDK_RGB_DITHER_NONE,
- image.GetData(),
- width*3 );
+ gdk_draw_rgb_image( GetPixmap(),
+ gc,
+ 0, 0,
+ width, height,
+ GDK_RGB_DITHER_NONE,
+ image.GetData(),
+ width*3 );
- gdk_gc_unref( gc );
- return TRUE;
- }
+ gdk_gc_unref( gc );
+ return true;
+ }
- // Create picture image
+ // Create picture image
- GdkImage *data_image =
- gdk_image_new( GDK_IMAGE_FASTEST, visual, width, height );
+ GdkImage *data_image =
+ gdk_image_new( GDK_IMAGE_FASTEST, visual, width, height );
- // Create mask image
+ // Create mask image
- GdkImage *mask_image = (GdkImage*) NULL;
+ GdkImage *mask_image = (GdkImage*) NULL;
- if (image.HasMask())
- {
- unsigned char *mask_data = (unsigned char*)malloc( ((width >> 3)+8) * height );
+ 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 );
+ 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 );
+ wxMask *mask = new wxMask();
+ mask->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 );
- SetMask( mask );
- }
+ SetMask( mask );
+ }
- // Render
+ // Render
- enum byte_order { RGB, RBG, BRG, BGR, GRB, GBR };
- byte_order b_o = RGB;
+ enum byte_order { RGB, RBG, BRG, BGR, GRB, GBR };
+ byte_order b_o = RGB;
- if (bpp > 8)
- {
- 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;
- }
+ if (bpp > 8)
+ {
+ 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;
+ }
- int r_mask = image.GetMaskRed();
- int g_mask = image.GetMaskGreen();
- int b_mask = image.GetMaskBlue();
+ int r_mask = image.GetMaskRed();
+ int g_mask = image.GetMaskGreen();
+ int b_mask = image.GetMaskBlue();
- unsigned char* data = image.GetData();
+ unsigned char* data = image.GetData();
- int index = 0;
- for (int y = 0; y < height; y++)
+ int index = 0;
+ for (int y = 0; y < height; y++)
+ {
+ for (int x = 0; x < width; x++)
{
- 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())
{
- 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 == 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 (bpp)
+ switch (bpp)
+ {
+ case 8:
{
- case 8:
+ int pixel = -1;
+ if (wxTheApp->m_colorCube)
{
- int pixel = -1;
- if (wxTheApp->m_colorCube)
- {
- pixel = wxTheApp->m_colorCube[ ((r & 0xf8) << 7) + ((g & 0xf8) << 2) + ((b & 0xf8) >> 3) ];
- }
- else
+ 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++)
{
- 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; }
- }
+ 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 );
+ gdk_image_put_pixel( data_image, x, y, pixel );
- break;
- }
- case 12: // SGI only
+ break;
+ }
+ case 12: // SGI only
+ {
+ guint32 pixel = 0;
+ switch (b_o)
{
- 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 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;
}
- case 15:
+ gdk_image_put_pixel( data_image, x, y, pixel );
+ break;
+ }
+ case 15:
+ {
+ guint32 pixel = 0;
+ switch (b_o)
{
- 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 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;
}
- case 16:
+ 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)
{
- // 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 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;
}
- case 32:
- case 24:
+ gdk_image_put_pixel( data_image, x, y, pixel );
+ break;
+ }
+ case 32:
+ case 24:
+ {
+ guint32 pixel = 0;
+ switch (b_o)
{
- 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 );
+ 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;
}
- default: break;
+ gdk_image_put_pixel( data_image, x, y, pixel );
+ break;
}
- } // for
- } // for
+ default: break;
+ }
+ } // for
+ } // for
- // Blit picture
+ // Blit picture
- GdkGC *data_gc = gdk_gc_new( GetPixmap() );
+ GdkGC *data_gc = gdk_gc_new( GetPixmap() );
- gdk_draw_image( GetPixmap(), data_gc, data_image, 0, 0, 0, 0, width, height );
+ gdk_draw_image( 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( GetMask()->GetBitmap() );
+ 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 );
+ gdk_draw_image( 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 TRUE;
+ return true;
}
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
+ wxImage image;
+
+ wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") );
+
+ image.Create(GetWidth(), GetHeight());
+ unsigned char *data = image.GetData();
+
+ if (!data)
+ {
+ wxFAIL_MSG( wxT("couldn't create image") );
+ return wxNullImage;
+ }
+
+ // 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") );
-
GdkImage *gdk_image = (GdkImage*) NULL;
- if (GetPixmap())
+
+ if (HasPixmap())
{
gdk_image = gdk_image_get( GetPixmap(),
- 0, 0,
- GetWidth(), GetHeight() );
+ 0, 0,
+ GetWidth(), GetHeight() );
}
else if (GetBitmap())
{
gdk_image = gdk_image_get( GetBitmap(),
- 0, 0,
- GetWidth(), GetHeight() );
+ 0, 0,
+ GetWidth(), GetHeight() );
}
else
{
wxCHECK_MSG( gdk_image, wxNullImage, wxT("couldn't create image") );
- image.Create( GetWidth(), GetHeight() );
- char unsigned *data = image.GetData();
-
- if (!data)
- {
- gdk_image_destroy( gdk_image );
- wxFAIL_MSG( wxT("couldn't create image") );
- return wxNullImage;
- }
-
GdkImage *gdk_image_mask = (GdkImage*) NULL;
if (GetMask())
{
int red_shift_left = 0;
int green_shift_left = 0;
int blue_shift_left = 0;
- bool use_shift = FALSE;
+ bool use_shift = false;
if (GetPixmap())
{
return image;
}
-wxBitmap::wxBitmap( const wxBitmap& bmp )
- : wxGDIObject()
-{
- Ref( bmp );
-}
-
-wxBitmap::wxBitmap( const wxString &filename, int type )
+wxBitmap::wxBitmap( const wxString &filename, wxBitmapType type )
{
LoadFile( filename, type );
}
{
}
-wxBitmap& wxBitmap::operator = ( const wxBitmap& bmp )
-{
- if ( m_refData != bmp.m_refData )
- Ref( bmp );
-
- return *this;
-}
-
bool wxBitmap::operator == ( const wxBitmap& bmp ) const
{
return m_refData == bmp.m_refData;
return m_refData != bmp.m_refData;
}
-bool wxBitmap::Ok() const
+bool wxBitmap::IsOk() const
{
- return (m_refData != NULL);
+ return (m_refData != NULL) &&
+ (M_BMPDATA->m_bitmap || M_BMPDATA->m_pixmap);
}
int wxBitmap::GetHeight() const
bool wxBitmap::CopyFromIcon(const wxIcon& icon)
{
*this = icon;
- return TRUE;
+ return true;
}
wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
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 );
gdk_gc_destroy( gc );
}
mask->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, rect.width, rect.height, 1 );
GdkGC *gc = gdk_gc_new( mask->m_bitmap );
- gdk_wx_draw_bitmap( mask->m_bitmap, gc, M_BMPDATA->m_mask->m_bitmap, 0, 0, rect.x, rect.y, rect.width, rect.height );
+ GdkColor col;
+ col.pixel = 0xFFFFFF;
+ gdk_gc_set_foreground( gc, &col );
+ col.pixel = 0;
+ gdk_gc_set_background( gc, &col );
+ gdk_wx_draw_bitmap( mask->m_bitmap, gc, M_BMPDATA->m_mask->m_bitmap, rect.x, rect.y, 0, 0, rect.width, rect.height );
gdk_gc_destroy( gc );
ret.SetMask( mask );
return ret;
}
-bool wxBitmap::SaveFile( const wxString &name, int type, wxPalette *WXUNUSED(palette) )
+bool wxBitmap::SaveFile( const wxString &name, wxBitmapType type, const wxPalette *WXUNUSED(palette) ) const
{
- wxCHECK_MSG( Ok(), FALSE, wxT("invalid bitmap") );
+ wxCHECK_MSG( Ok(), false, wxT("invalid bitmap") );
// Try to save the bitmap via wxImage handlers:
{
if (image.Ok()) return image.SaveFile( name, type );
}
- return FALSE;
+ return false;
}
-bool wxBitmap::LoadFile( const wxString &name, int type )
+bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type )
{
UnRef();
if (!wxFileExists(name))
- return FALSE;
+ return false;
GdkVisual *visual = wxTheApp->GetGdkVisual();
{
wxImage image;
if ( !image.LoadFile( name, type ) || !image.Ok() )
- return FALSE;
+ return false;
*this = wxBitmap(image);
}
- return TRUE;
+ return true;
}
+#if wxUSE_PALETTE
wxPalette *wxBitmap::GetPalette() const
{
if (!Ok())
return M_BMPDATA->m_palette;
}
+void wxBitmap::SetPalette(const wxPalette& WXUNUSED(palette))
+{
+ // TODO
+}
+#endif // wxUSE_PALETTE
+
void wxBitmap::SetHeight( int height )
{
if (!m_refData)
return M_BMPDATA->m_pixmap;
}
+bool wxBitmap::HasPixmap() const
+{
+ wxCHECK_MSG( Ok(), false, wxT("invalid bitmap") );
+
+ return M_BMPDATA->m_pixmap != NULL;
+}
+
GdkBitmap *wxBitmap::GetBitmap() const
{
wxCHECK_MSG( Ok(), (GdkBitmap *) NULL, wxT("invalid bitmap") );
return M_BMPDATA->m_bitmap;
}
+
+void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)
+{
+ return NULL;
+}
+
+void wxBitmap::UngetRawData(wxPixelDataBase& WXUNUSED(data))
+{
+}
+
+bool wxBitmap::HasAlpha() const
+{
+ return false;
+}
+
+void wxBitmap::UseAlpha()
+{
+}
+
+//-----------------------------------------------------------------------------
+// wxBitmapHandler
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandler, wxBitmapHandlerBase)
+
+/* static */ void wxBitmap::InitStandardHandlers()
+{
+ // TODO: Insert handler based on GdkPixbufs handler later
+}
projects / wxWidgets.git / blobdiff