/////////////////////////////////////////////////////////////////////////////
-// Name: bitmap.cpp
+// Name: src/x11/bitmap.cpp
// Purpose: wxBitmap
// Author: Julian Smart, Robert Roebling
// Modified by:
// 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/bitmap.h"
-#include "wx/icon.h"
-#include "wx/log.h"
-#include "wx/image.h"
-#include "wx/app.h"
-#if wxUSE_NANOX
-#include "wx/dcmemory.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/log.h"
+ #include "wx/app.h"
+ #include "wx/dcmemory.h"
+ #include "wx/icon.h"
+ #include "wx/math.h"
+ #include "wx/image.h"
#endif
#include "wx/x11/private.h"
#include "wx/wfstream.h"
#endif
#endif
-#include <math.h>
//-----------------------------------------------------------------------------
// wxMask
m_display = bitmap.GetDisplay();
wxImage image = bitmap.ConvertToImage();
- if (!image.Ok()) return FALSE;
+ if (!image.Ok()) return false;
m_display = bitmap.GetDisplay();
if (bpp == 15)
{
- red = red & 0xf8;
- green = green & 0xf8;
- blue = blue & 0xf8;
+ red &= 0xf8;
+ green &= 0xf8;
+ blue &= 0xf8;
} else
if (bpp == 16)
{
- red = red & 0xf8;
- green = green & 0xfc;
- blue = blue & 0xf8;
+ red &= 0xf8;
+ green &= 0xfc;
+ blue &= 0xf8;
} else
if (bpp == 12)
{
- red = red & 0xf0;
- green = green & 0xf0;
- blue = blue & 0xf0;
+ red &= 0xf0;
+ green &= 0xf0;
+ blue &= 0xf0;
}
XSetForeground( xdisplay, gc, BlackPixel(xdisplay,xscreen) );
XFreeGC( xdisplay, gc );
- return TRUE;
+ return true;
#else
- return FALSE;
+ return false;
#endif
// wxUSE_NANOX
}
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);
m_bitmap = 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_display = bitmap.GetDisplay();
m_bitmap = (WXPixmap) XCreatePixmap( (Display*) m_display, xroot, bitmap.GetWidth(), bitmap.GetHeight(), 1 );
- if (!m_bitmap) return FALSE;
+ if (!m_bitmap) return false;
GC gc = XCreateGC( (Display*) m_display, (Pixmap) m_bitmap, 0, NULL );
XFreeGC( (Display*) m_display, gc );
- return TRUE;
+ return true;
#else
- return FALSE;
+ return false;
#endif
// wxUSE_NANOX
}
{
public:
wxBitmapRefData();
- ~wxBitmapRefData();
+ virtual ~wxBitmapRefData();
WXPixmap m_pixmap;
WXPixmap m_bitmap;
int x, int y, int width, int height,
int depth )
{
- int xscreen = DefaultScreen( (Display*)xdisplay );
- Window xroot = RootWindow( (Display*)xdisplay, xscreen );
- Visual* xvisual = DefaultVisual( xdisplay, xscreen );
+ Display * const dpy = (Display *)xdisplay;
+
+ int xscreen = DefaultScreen( dpy );
+ Window xroot = RootWindow( dpy, xscreen );
+ Visual* xvisual = DefaultVisual( dpy, xscreen );
- XImage* ximage = XCreateImage( (Display*)xdisplay, xvisual, depth,
+ XImage* ximage = XCreateImage( dpy, xvisual, depth,
ZPixmap, 0, 0, width, height, 32, 0 );
ximage->data = (char*)malloc( ximage->bytes_per_line * ximage->height );
- ximage = XGetSubImage( (Display*)xdisplay, (Pixmap)xpixmap,
+ ximage = XGetSubImage( dpy, (Pixmap)xpixmap,
x, y, width, height,
AllPlanes, ZPixmap, ximage, 0, 0 );
- GC gc = XCreateGC( (Display*)xdisplay, (Pixmap)xpixmap, 0, NULL );
- Pixmap ret = XCreatePixmap( (Display*)xdisplay, xroot,
+ GC gc = XCreateGC( dpy, (Pixmap)xpixmap, 0, NULL );
+ Pixmap ret = XCreatePixmap( dpy, xroot,
width, height, depth );
- XPutImage( (Display*)xdisplay, ret, gc, ximage,
+ XPutImage( dpy, ret, gc, ximage,
0, 0, 0, 0, width, height );
XDestroyImage( ximage );
- XFreeGC( (Display*)xdisplay, gc );
+ XFreeGC( dpy, gc );
return (WXPixmap)ret;
}
{
UnRef();
- wxCHECK_MSG( (width > 0) && (height > 0), FALSE, wxT("invalid bitmap size") )
+ wxCHECK_MSG( (width > 0) && (height > 0), false, wxT("invalid bitmap size") );
m_refData = new wxBitmapRefData();
if (depth == -1) depth = bpp;
wxCHECK_MSG( (depth == bpp) ||
- (depth == 1), FALSE, wxT("invalid bitmap depth") )
+ (depth == 1), false, wxT("invalid bitmap depth") );
M_BMPDATA->m_mask = (wxMask *) NULL;
M_BMPDATA->m_width = width;
return Ok();
}
-bool wxBitmap::Create(void *data, wxBitmapType type,
+bool wxBitmap::Create(const void* data, wxBitmapType type,
int width, int height, int depth)
{
UnRef();
wxLogWarning(wxT("no data bitmap handler for type %ld defined."),
(long)type);
- return FALSE;
+ return false;
}
return handler->Create(this, data, type, width, height, depth);
return true;
}
-bool wxBitmap::CreateFromXpm( const char **bits )
+wxBitmap::wxBitmap(const char* const* bits)
{
- wxCHECK_MSG( bits, FALSE, wxT("NULL pointer in wxBitmap::CreateFromXpm") );
-
- return Create(bits, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0);
+ Create(bits, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0);
}
bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
if (!image.Ok())
{
wxASSERT_MSG(image.Ok(), wxT("Invalid wxImage passed to wxBitmap::CreateFromImage."));
- return FALSE;
+ return false;
}
int w = image.GetWidth();
int h = image.GetHeight();
if (!Create(w, h, depth))
- return FALSE;
+ return false;
// Unfortunately the mask has to be screen-depth since
// 1-bpp bitmaps don't seem to be supported
maskGC = GrNewGC();
maskPixmap = GrNewPixmap(w, h, 0);
if (!maskPixmap)
- hasMask = FALSE;
+ hasMask = false;
else
{
wxMask* mask = new wxMask;
if (hasMask)
GrDestroyGC(maskGC);
- return TRUE;
+ return true;
#else
// !wxUSE_NANOX
UnRef();
- wxCHECK_MSG( image.Ok(), FALSE, wxT("invalid image") )
- wxCHECK_MSG( depth == -1, FALSE, wxT("invalid bitmap depth") )
+ wxCHECK_MSG( image.Ok(), false, wxT("invalid image") );
+ wxCHECK_MSG( depth == -1, false, wxT("invalid bitmap depth") );
m_refData = new wxBitmapRefData();
if (data_image->data == NULL)
{
wxLogError( wxT("Out of memory.") ); // TODO clean
- return FALSE;
+ return false;
}
M_BMPDATA->m_pixmap = (WXPixmap) XCreatePixmap( xdisplay, xroot, width, height, depth );
if (mask_image->data == NULL)
{
wxLogError( wxT("Out of memory.") ); // TODO clean
- return FALSE;
+ return false;
}
wxMask *mask = new wxMask();
}
}
- return TRUE;
+ return true;
#endif
// wxUSE_NANOX
}
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())
{
}
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;
+ data[pos] = (unsigned char)((pixel >> red_shift_right) << red_shift_left);
+ data[pos+1] = (unsigned char)((pixel >> green_shift_right) << green_shift_left);
+ data[pos+2] = (unsigned char)((pixel >> blue_shift_right) << blue_shift_left);
}
else if (colors)
{
- data[pos] = colors[pixel].red >> 8;
- data[pos+1] = colors[pixel].green >> 8;
- data[pos+2] = colors[pixel].blue >> 8;
+ data[pos] = (unsigned char)(colors[pixel].red >> 8);
+ data[pos+1] = (unsigned char)(colors[pixel].green >> 8);
+ data[pos+2] = (unsigned char)(colors[pixel].blue >> 8);
}
else
{
// wxUSE_NANOX
}
-wxBitmap::wxBitmap( const wxBitmap& bmp )
-{
- Ref( bmp );
-}
-
wxBitmap::wxBitmap( const wxString &filename, wxBitmapType type )
{
LoadFile( filename, type );
{
m_refData = new wxBitmapRefData;
- (void) Create((void*) bits, wxBITMAP_TYPE_XBM_DATA, width, height, depth);
+ (void) Create(bits, wxBITMAP_TYPE_XBM_DATA, width, height, depth);
}
wxBitmap::~wxBitmap()
{
}
-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);
}
bool wxBitmap::CopyFromIcon(const wxIcon& icon)
{
*this = icon;
- return TRUE;
+ return true;
}
wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
bool wxBitmap::SaveFile( const wxString &name, wxBitmapType type,
const wxPalette *palette ) const
{
- wxCHECK_MSG( Ok(), FALSE, wxT("invalid bitmap") );
+ wxCHECK_MSG( Ok(), false, wxT("invalid bitmap") );
wxBitmapHandler *handler = FindHandler(type);
wxImage image(this->ConvertToImage());
if (image.Ok()) return image.SaveFile( name, type );
- return FALSE;
+ return false;
}
return handler->SaveFile(this, name, type, palette);
{
UnRef();
- if (!wxFileExists(name)) return FALSE;
+ if (!wxFileExists(name)) return false;
wxBitmapHandler *handler = FindHandler(type);
{
wxImage image;
if (!image.LoadFile( name, type ))
- return FALSE;
+ return false;
if (image.Ok())
{
*this = wxBitmap(image);
- return TRUE;
+ return true;
}
- else return FALSE;
+ else return false;
}
return handler->LoadFile(this, name, type, -1, -1);
if (sinfo.pixtype == MWPF_PALETTE) {
if(!(palette = (GR_PALETTE*) malloc(sizeof(GR_PALETTE)))) {
- return FALSE;
+ return false;
}
GrGetSystemPalette(palette);
}
if(!(pixels = (GR_PIXELVAL*) malloc(sizeof(GR_PIXELVAL) * width * height)))
{
- return FALSE;
+ return false;
}
image.Create(width, height);
free(pixels);
if(palette) free(palette);
- return TRUE;
+ return true;
}
#if 0
// Bitmap handlers
// ============================================================================
-IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandler, wxBitmapHandlerBase);
+IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandler, wxBitmapHandlerBase)
#define M_BMPHANDLERDATA ((wxBitmapRefData *)bitmap->GetRefData())
class wxXPMFileHandler : public wxBitmapHandler
{
- DECLARE_DYNAMIC_CLASS(wxXPMFileHandler);
+ DECLARE_DYNAMIC_CLASS(wxXPMFileHandler)
public:
wxXPMFileHandler()
{
- m_name = wxT("XPM file");
- m_extension = wxT("xpm");
- m_type = wxBITMAP_TYPE_XPM;
+ SetName( wxT("XPM file") );
+ SetExtension( wxT("xpm") );
+ SetType( wxBITMAP_TYPE_XPM );
};
virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
virtual bool SaveFile(const wxBitmap *bitmap, const wxString& name,
int type, const wxPalette *palette = NULL);
- virtual bool Create(wxBitmap *bitmap, void *data, long flags,
- int width, int height, int depth = 1)
- { return FALSE; }
+ virtual bool Create(wxBitmap *WXUNUSED(bitmap), const void* WXUNUSED(data), long WXUNUSED(flags),
+ int WXUNUSED(width), int WXUNUSED(height), int WXUNUSED(depth) = 1)
+ { return false; }
};
-IMPLEMENT_DYNAMIC_CLASS(wxXPMFileHandler, wxBitmapHandler);
+IMPLEMENT_DYNAMIC_CLASS(wxXPMFileHandler, wxBitmapHandler)
bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name,
- long flags, int desiredWidth,
- int desiredHeight)
+ long WXUNUSED(flags), int WXUNUSED(desiredWidth),
+ int WXUNUSED(desiredHeight))
{
#if wxHAVE_LIB_XPM
if (!bitmap->GetRefData())
{
UnRef();
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
#elif wxUSE_STREAMS
wxXPMDecoder decoder;
wxFileInputStream stream(name);
return image.Ok() && bitmap->CreateFromImage(image);
}
- return FALSE;
+ return false;
#else // !wxHAVE_LIB_XPM && !wxUSE_STREAMS
- return FALSE;
+ return false;
#endif // wxHAVE_LIB_XPM / wxUSE_STREAMS
}
wxImage image(bitmap->ConvertToImage());
if (image.Ok()) return image.SaveFile( name, (wxBitmapType)type );
- return FALSE;
+ return false;
}
#endif // wxHAVE_LIB_XPM || wxUSE_STREAMS
class wxXPMDataHandler : public wxBitmapHandler
{
- DECLARE_DYNAMIC_CLASS(wxXPMDataHandler);
+ DECLARE_DYNAMIC_CLASS(wxXPMDataHandler)
public:
wxXPMDataHandler()
{
- m_name = wxT("XPM data");
- m_extension = wxT("xpm");
- m_type = wxBITMAP_TYPE_XPM_DATA;
+ SetName( wxT("XPM data") );
+ SetExtension( wxT("xpm") );
+ SetType( wxBITMAP_TYPE_XPM_DATA );
};
- virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
- int desiredWidth, int desiredHeight)
- { return FALSE; }
+ virtual bool LoadFile(wxBitmap *WXUNUSED(bitmap),
+ const wxString& WXUNUSED(name),
+ long WXUNUSED(flags),
+ int WXUNUSED(desiredWidth),
+ int WXUNUSED(desiredHeight))
+ { return false; }
- virtual bool SaveFile(const wxBitmap *bitmap, const wxString& name,
- int type, const wxPalette *palette = NULL)
- { return FALSE; }
+ virtual bool SaveFile(const wxBitmap *WXUNUSED(bitmap),
+ const wxString& WXUNUSED(name),
+ int WXUNUSED(type),
+ const wxPalette *WXUNUSED(palette) = NULL)
+ { return false; }
- virtual bool Create(wxBitmap *bitmap, void *data, long flags,
+ virtual bool Create(wxBitmap *bitmap, const void* data, long flags,
int width, int height, int depth = 1);
};
-IMPLEMENT_DYNAMIC_CLASS(wxXPMDataHandler, wxBitmapHandler);
+IMPLEMENT_DYNAMIC_CLASS(wxXPMDataHandler, wxBitmapHandler)
-bool wxXPMDataHandler::Create(wxBitmap *bitmap, void *bits,
+bool wxXPMDataHandler::Create(wxBitmap *bitmap, const void* bits,
long WXUNUSED(flags),
- int width, int height, int WXUNUSED(depth))
+ int WXUNUSED(width), int WXUNUSED(height), int WXUNUSED(depth))
{
#if wxHAVE_LIB_XPM
- wxCHECK_MSG( bits != NULL, FALSE, wxT("invalid bitmap data") )
+ wxCHECK_MSG( bits != NULL, false, wxT("invalid bitmap data") );
if (!bitmap->GetRefData())
bitmap->SetRefData( new wxBitmapRefData() );
M_BMPHANDLERDATA->m_mask->SetBitmap( (WXPixmap) mask );
M_BMPHANDLERDATA->m_mask->SetDisplay( xdisplay );
}
- return TRUE;
+ return true;
}
else
{
bitmap->UnRef();
- return FALSE;
+ return false;
}
#else // !wxHAVE_LIB_XPM
wxXPMDecoder decoder;
public:
inline wxXBMDataHandler()
{
- m_name = wxT("XBM data");
- m_extension = wxT("xbm");
- m_type = wxBITMAP_TYPE_XBM_DATA;
+ SetName( wxT("XBM data") );
+ SetExtension( wxT("xbm") );
+ SetType( wxBITMAP_TYPE_XBM_DATA );
};
- virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
- int desiredWidth, int desiredHeight)
- { return FALSE; }
+ virtual bool LoadFile(wxBitmap *WXUNUSED(bitmap),
+ const wxString& WXUNUSED(name),
+ long WXUNUSED(flags),
+ int WXUNUSED(desiredWidth),
+ int WXUNUSED(desiredHeight))
+ { return false; }
- virtual bool SaveFile(const wxBitmap *bitmap, const wxString& name,
- int type, const wxPalette *palette = NULL)
- { return FALSE; }
+ virtual bool SaveFile(const wxBitmap *WXUNUSED(bitmap),
+ const wxString& WXUNUSED(name),
+ int WXUNUSED(type),
+ const wxPalette *WXUNUSED(palette) = NULL)
+ { return false; }
- virtual bool Create(wxBitmap *bitmap, void *data, long flags,
+ virtual bool Create(wxBitmap *bitmap, const void* data, long flags,
int width, int height, int depth = 1);
};
-IMPLEMENT_DYNAMIC_CLASS(wxXBMDataHandler, wxBitmapHandler);
+IMPLEMENT_DYNAMIC_CLASS(wxXBMDataHandler, wxBitmapHandler)
-bool wxXBMDataHandler::Create( wxBitmap *bitmap, void *bits,
+bool wxXBMDataHandler::Create( wxBitmap *bitmap, const void* bits,
long WXUNUSED(flags),
- int width, int height, int depth)
+ int width, int height, int WXUNUSED(depth))
{
#if !wxUSE_NANOX
if (!bitmap->GetRefData())
M_BMPHANDLERDATA->m_height = height;
M_BMPHANDLERDATA->m_bpp = 1;
- return TRUE;
+ return true;
#else
- wxCHECK_MSG( M_BMPHANDLERDATA->m_bitmap, FALSE,
+ wxCHECK_MSG( M_BMPHANDLERDATA->m_bitmap, false,
wxT("couldn't create bitmap") );
#endif
}
projects / wxWidgets.git / blobdiff