#include "wx/bitmap.h"
#include "wx/colour.h"
#include "wx/image.h"
-
-#warning "move this to common"
-#include "wx/xpmdecod.h"
+#include "wx/rawbmp.h"
#include "wx/dfb/private.h"
// helpers
//-----------------------------------------------------------------------------
-// Convert wxColour into it's quantized value in lower-precision
-// pixel format (needed for masking by colour).
-static wxColour wxQuantizeColour(const wxColour& clr, const wxBitmap& bmp)
-{
-#if 0
- pixel_format_t *pf = bmp.GetMGLbitmap_t()->pf;
-
- if ( pf->redAdjust == 0 && pf->greenAdjust == 0 && pf->blueAdjust == 0 )
- return clr;
- else
- return wxColour((unsigned char)((clr.Red() >> pf->redAdjust) << pf->redAdjust),
- (unsigned char)((clr.Green() >> pf->greenAdjust) << pf->greenAdjust),
- (unsigned char)((clr.Blue() >> pf->blueAdjust) << pf->blueAdjust));
-#endif
+// NB: Most of this conversion code is needed because of differences between
+// wxImage and wxDFB's wxBitmap representations:
+// (1) wxImage uses RGB order, while DirectFB uses BGR
+// (2) wxImage has alpha channel in a separate plane, while DirectFB puts
+// all components into single BGRA plane
+
+// pitch = stride = # of bytes between the start of N-th line and (N+1)-th line
+// {Src,Dst}PixSize = # of bytes used to represent one pixel
+template<int SrcPixSize, int DstPixSize>
+static void CopyPixelsAndSwapRGB(unsigned w, unsigned h,
+ const unsigned char *src,
+ unsigned src_pitch,
+ unsigned char *dst,
+ unsigned dst_pitch)
+{
+ unsigned src_advance = src_pitch - SrcPixSize * w;
+ unsigned dst_advance = dst_pitch - DstPixSize * w;
+ for ( unsigned y = 0; y < h; y++, src += src_advance, dst += dst_advance )
+ {
+ for ( unsigned x = 0; x < w; x++, src += SrcPixSize, dst += DstPixSize )
+ {
+ // copy with RGB -> BGR translation:
+ dst[0] = src[2];
+ dst[1] = src[1];
+ dst[2] = src[0];
+ }
+ }
}
+static void CopySurfaceToImage(const wxIDirectFBSurfacePtr& surface,
+ wxImage& image)
+{
+ wxIDirectFBSurface::Locked locked(surface, DSLF_READ);
+ wxCHECK_RET( locked.ptr, "failed to lock surface" );
-//-----------------------------------------------------------------------------
-// wxMask
-//-----------------------------------------------------------------------------
+ const unsigned width = image.GetWidth();
+ const unsigned height = image.GetHeight();
+ const DFBSurfacePixelFormat format = surface->GetPixelFormat();
-IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject)
+ // copy RGB data from the surface:
+ switch ( format )
+ {
+ case DSPF_RGB24:
+ CopyPixelsAndSwapRGB<3,3>
+ (
+ width, height,
+ (unsigned char*)locked.ptr, locked.pitch,
+ image.GetData(), width * 3
+ );
+ break;
+
+ case DSPF_RGB32:
+ case DSPF_ARGB:
+ CopyPixelsAndSwapRGB<4,3>
+ (
+ width, height,
+ (unsigned char*)locked.ptr, locked.pitch,
+ image.GetData(), width * 3
+ );
+ break;
+
+ default:
+ wxFAIL_MSG( "unexpected pixel format" );
+ return;
+ }
-wxMask::wxMask() : m_bitmap(NULL)
-{
+ // extract alpha channel if the bitmap has it:
+ if ( format == DSPF_ARGB )
+ {
+ // create alpha plane:
+ image.SetAlpha();
+
+ // and copy alpha data to it:
+ const unsigned advance = locked.pitch - 4 * width;
+ unsigned char *alpha = image.GetAlpha();
+ // NB: "+3" is to get pointer to alpha component
+ const unsigned char *src = ((unsigned char*)locked.ptr) + 3;
+
+ for ( unsigned y = 0; y < height; y++, src += advance )
+ for ( unsigned x = 0; x < width; x++, src += 4 )
+ *(alpha++) = *src;
+ }
}
-wxMask::wxMask(const wxBitmap& bitmap)
- : m_bitmap(NULL)
+static void CopyImageToSurface(const wxImage& image,
+ const wxIDirectFBSurfacePtr& surface)
{
- Create(bitmap);
-}
+ wxIDirectFBSurface::Locked locked(surface, DSLF_WRITE);
+ wxCHECK_RET( locked.ptr, "failed to lock surface" );
-wxMask::wxMask(const wxBitmap& bitmap, const wxColour& colour)
- : m_bitmap(NULL)
-{
- Create(bitmap, colour);
-}
+ const unsigned width = image.GetWidth();
+ const unsigned height = image.GetHeight();
+ const DFBSurfacePixelFormat format = surface->GetPixelFormat();
-#if wxUSE_PALETTE
-wxMask::wxMask(const wxBitmap& bitmap, int paletteIndex)
- : m_bitmap(NULL)
-{
- Create(bitmap, paletteIndex);
-}
-#endif // wxUSE_PALETTE
+ // copy RGB data to the surface:
+ switch ( format )
+ {
+ case DSPF_RGB24:
+ CopyPixelsAndSwapRGB<3,3>
+ (
+ width, height,
+ image.GetData(), width * 3,
+ (unsigned char*)locked.ptr, locked.pitch
+ );
+ break;
+
+ case DSPF_RGB32:
+ case DSPF_ARGB:
+ CopyPixelsAndSwapRGB<3,4>
+ (
+ width, height,
+ image.GetData(), width * 3,
+ (unsigned char*)locked.ptr, locked.pitch
+ );
+ break;
+
+ default:
+ wxFAIL_MSG( "unexpected pixel format" );
+ return;
+ }
-wxMask::wxMask(const wxMask& mask)
-{
- m_bitmap = mask.m_bitmap ? new wxBitmap(*mask.m_bitmap) : NULL;
-}
+ // if the image has alpha channel, merge it in:
+ if ( format == DSPF_ARGB )
+ {
+ wxCHECK_RET( image.HasAlpha(), "logic error - ARGB, but no alpha" );
-wxMask::~wxMask()
-{
- delete m_bitmap;
+ const unsigned advance = locked.pitch - 4 * width;
+ const unsigned char *alpha = image.GetAlpha();
+ // NB: "+3" is to get pointer to alpha component
+ unsigned char *dest = ((unsigned char*)locked.ptr) + 3;
+
+ for ( unsigned y = 0; y < height; y++, dest += advance )
+ for ( unsigned x = 0; x < width; x++, dest += 4 )
+ *dest = *(alpha++);
+ }
}
-#warning "move this to common code"
-bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
+static wxIDirectFBSurfacePtr
+CreateSurfaceWithFormat(int w, int h, DFBSurfacePixelFormat format)
{
- delete m_bitmap;
- m_bitmap = NULL;
-
- wxColour clr(wxQuantizeColour(colour, bitmap));
-
- wxImage imgSrc(bitmap.ConvertToImage());
- imgSrc.SetMask(false);
- wxImage image(imgSrc.ConvertToMono(clr.Red(), clr.Green(), clr.Blue()));
- if ( !image.Ok() )
- return false;
+ DFBSurfaceDescription desc;
+ desc.flags = (DFBSurfaceDescriptionFlags)
+ (DSDESC_CAPS | DSDESC_WIDTH | DSDESC_HEIGHT);
+ desc.caps = DSCAPS_NONE;
+ desc.width = w;
+ desc.height = h;
- m_bitmap = new wxBitmap(image, 1);
+ if ( format != DSPF_UNKNOWN )
+ {
+ desc.flags = (DFBSurfaceDescriptionFlags)(
+ desc.flags | DSDESC_PIXELFORMAT);
+ desc.pixelformat = format;
+ }
- return m_bitmap->Ok();
+ return wxIDirectFB::Get()->CreateSurface(&desc);
}
-#if wxUSE_PALETTE
-bool wxMask::Create(const wxBitmap& bitmap, int paletteIndex)
+// Creates a surface that will use wxImage's pixel data (RGB only)
+static wxIDirectFBSurfacePtr CreateSurfaceForImage(const wxImage& image)
{
- unsigned char r,g,b;
- wxPalette *pal = bitmap.GetPalette();
-
- wxCHECK_MSG( pal, false, wxT("Cannot create mask from bitmap without palette") );
+ wxCHECK_MSG( image.Ok(), NULL, "invalid image" );
+ // FIXME_DFB: implement alpha handling by merging alpha buffer with RGB
+ // into a temporary RGBA surface
+ wxCHECK_MSG( !image.HasAlpha(), NULL, "alpha channel not supported" );
- pal->GetRGB(paletteIndex, &r, &g, &b);
-
- return Create(bitmap, wxColour(r, g, b));
+ // NB: wxImage uses RGB order of bytes while DirectFB uses BGR, so we
+ // cannot use preallocated surface that shares data with wxImage, we
+ // have to copy the data to temporary surface instead
+ return CreateSurfaceWithFormat(image.GetWidth(), image.GetHeight(),
+ DSPF_RGB24);
}
-#endif // wxUSE_PALETTE
-bool wxMask::Create(const wxBitmap& bitmap)
+static bool ConvertSurfaceToFormat(wxIDirectFBSurfacePtr& surface,
+ DFBSurfacePixelFormat format)
{
- delete m_bitmap;
- m_bitmap = NULL;
+ if ( surface->GetPixelFormat() == format )
+ return true;
- wxCHECK_MSG( bitmap.Ok(), false, wxT("Invalid bitmap") );
- wxCHECK_MSG( bitmap.GetDepth() == 1, false, wxT("Cannot create mask from colour bitmap") );
+ int w, h;
+ surface->GetSize(&w, &h);
+ wxIDirectFBSurfacePtr s = CreateSurfaceWithFormat(w, h, format);
+ if ( !s )
+ return false;
- m_bitmap = new wxBitmap(bitmap);
+ if ( !s->SetBlittingFlags(DSBLIT_NOFX) )
+ return false;
+ if ( !s->Blit(surface->GetRaw(), NULL, 0, 0) )
+ return false;
+
+ surface = s;
return true;
}
-const wxBitmap& wxMask::GetBitmap() const
+static DFBSurfacePixelFormat DepthToFormat(int depth)
{
- return m_bitmap ? *m_bitmap : wxNullBitmap;
+ switch ( depth )
+ {
+ case 24:
+ return DSPF_RGB24;
+ case 32:
+ // NB: we treat depth=32 as requesting ARGB for consistency with
+ // other ports
+ return DSPF_ARGB;
+ default:
+ wxFAIL_MSG( "unsupported depth requested" );
+ // fall through
+ case -1:
+ return DSPF_UNKNOWN;
+ }
}
-
//-----------------------------------------------------------------------------
// wxBitmapRefData
//-----------------------------------------------------------------------------
wxBitmapRefData(const wxBitmapRefData& data)
{
- if ( data.m_surface )
- m_surface = data.m_surface->Clone();
+ m_surface = data.m_surface ? data.m_surface->Clone() : NULL;
m_mask = data.m_mask ? new wxMask(*data.m_mask) : NULL;
#if wxUSE_PALETTE
#endif
}
- ~wxBitmapRefData()
+ virtual ~wxBitmapRefData()
{
delete m_mask;
#if wxUSE_PALETTE
// wxBitmap
//-----------------------------------------------------------------------------
-IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandler, wxObject)
+IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandler, wxBitmapHandlerBase)
IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxBitmapBase)
wxBitmap::wxBitmap(int width, int height, int depth)
{
UnRef();
- wxCHECK_MSG( surface, false, _T("invalid surface") );
+ wxCHECK_MSG( surface, false, "invalid surface" );
m_refData = new wxBitmapRefData();
M_BITMAP->m_surface = surface;
bool wxBitmap::Create(int width, int height, int depth)
{
- UnRef();
-
- wxCHECK_MSG( width > 0 && height > 0, false, wxT("invalid bitmap size") );
-
- DFBSurfaceDescription desc;
- desc.flags = (DFBSurfaceDescriptionFlags)(
- DSDESC_CAPS | DSDESC_WIDTH | DSDESC_HEIGHT);
- desc.caps = DSCAPS_NONE;
- desc.width = width;
- desc.height = height;
-
- return Create(wxIDirectFB::Get()->CreateSurface(&desc));
+ return CreateWithFormat(width, height, DepthToFormat(depth));
}
-#warning "FIXME: move this to common code"
-bool wxBitmap::CreateFromXpm(const char **bits)
+bool wxBitmap::CreateWithFormat(int width, int height, int dfbFormat)
{
- wxCHECK_MSG( bits != NULL, false, wxT("invalid bitmap data") );
-
-#if wxUSE_IMAGE && wxUSE_XPM
- wxXPMDecoder decoder;
- wxImage img = decoder.ReadData(bits);
- wxCHECK_MSG( img.Ok(), false, wxT("invalid bitmap data") );
+ UnRef();
- *this = wxBitmap(img);
+ wxCHECK_MSG( width > 0 && height > 0, false, wxT("invalid bitmap size") );
- return true;
-#else
- wxFAIL_MSG( _T("creating bitmaps from XPMs not supported") );
- return false;
-#endif // wxUSE_IMAGE && wxUSE_XPM
+ return Create(CreateSurfaceWithFormat(width, height,
+ DFBSurfacePixelFormat(dfbFormat)));
}
#if wxUSE_IMAGE
wxBitmap::wxBitmap(const wxImage& image, int depth)
{
wxCHECK_RET( image.Ok(), wxT("invalid image") );
+
+ DFBSurfacePixelFormat format = DepthToFormat(depth);
+ if ( format == DSPF_UNKNOWN && image.HasAlpha() )
+ format = DSPF_ARGB;
+
+ // create surface in screen's format (unless we need alpha channel,
+ // in which case use ARGB):
+ if ( !CreateWithFormat(image.GetWidth(), image.GetHeight(), format) )
+ return;
+
+ // then copy the image to it:
+ wxIDirectFBSurfacePtr dst = M_BITMAP->m_surface;
+
+ switch ( dst->GetPixelFormat() )
+ {
+ case DSPF_RGB24:
+ case DSPF_RGB32:
+ case DSPF_ARGB:
+ CopyImageToSurface(image, dst);
+ break;
+
+ default:
+ {
+ // wxBitmap uses different pixel format, so we have to use a
+ // temporary surface and blit to the bitmap via it:
+ wxIDirectFBSurfacePtr src(CreateSurfaceForImage(image));
+ CopyImageToSurface(image, src);
+
+ if ( !dst->SetBlittingFlags(DSBLIT_NOFX) )
+ return;
+ if ( !dst->Blit(src->GetRaw(), NULL, 0, 0) )
+ return;
+ }
+ }
+
+ // FIXME: implement mask creation from image's mask (or alpha channel?)
+ wxASSERT_MSG( !image.HasMask(), "image masks are ignored for now" );
}
wxImage wxBitmap::ConvertToImage() const
{
wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") );
- return wxNullImage; // FIXME
+ wxImage img(GetWidth(), GetHeight());
+ wxIDirectFBSurfacePtr src = M_BITMAP->m_surface;
+
+ switch ( src->GetPixelFormat() )
+ {
+ case DSPF_RGB24:
+ case DSPF_RGB32:
+ case DSPF_ARGB:
+ CopySurfaceToImage(src, img);
+ break;
+ default:
+ {
+ // wxBitmap uses different pixel format, so we have to use a
+ // temporary surface and blit to the bitmap via it:
+ wxIDirectFBSurfacePtr dst(CreateSurfaceForImage(img));
+
+ if ( !dst->SetBlittingFlags(DSBLIT_NOFX) )
+ return wxNullImage;
+ if ( !dst->Blit(src->GetRaw(), NULL, 0, 0) )
+ return wxNullImage;
+
+ CopySurfaceToImage(dst, img);
+ }
+ }
+
+ // FIXME: implement mask setting in the image
+ wxASSERT_MSG( GetMask() == NULL, "bitmap masks are ignored for now" );
+
+ return img;
}
#endif // wxUSE_IMAGE
+void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)
+{
+ wxCHECK_MSG( Ok(), NULL, "invalid bitmap" );
+
+ AllocExclusive();
+
+ DFBSurfacePixelFormat format;
+ if ( bpp == 32 )
+ format = DSPF_ARGB;
+ else
+ format = DSPF_RGB24;
+
+ // convert the bitmap into format compatible with requested raw access;
+ // note that we don't bother converting the bitmap back in UngetRawData(),
+ // as unpacked formats (RGB24, RGB32) are the common case and converting
+ // between them while blitting is fast enough (FIXME?)
+ if ( !ConvertSurfaceToFormat(M_BITMAP->m_surface, format) )
+ return NULL;
+
+ void *bits = NULL;
+ if ( !M_BITMAP->m_surface->Lock
+ (
+ (DFBSurfaceLockFlags)(DSLF_READ | DSLF_WRITE),
+ &bits,
+ &data.m_stride
+ ) )
+ return NULL;
+
+ M_BITMAP->m_surface->GetSize(&data.m_width, &data.m_height);
+
+ return bits;
+}
+
+void wxBitmap::UngetRawData(wxPixelDataBase& WXUNUSED(data))
+{
+ M_BITMAP->m_surface->Unlock();
+}
+
+bool wxBitmap::HasAlpha() const
+{
+ wxCHECK_MSG( Ok(), false, "invalid bitmap" );
+
+ return M_BITMAP->m_surface->GetPixelFormat() == DSPF_ARGB;
+}
+
wxBitmap::wxBitmap(const wxString &filename, wxBitmapType type)
{
LoadFile(filename, type);
wxBitmap::wxBitmap(const char bits[], int width, int height, int depth)
{
wxCHECK_RET( depth == 1, wxT("can only create mono bitmap from XBM data") );
-}
-bool wxBitmap::Ok() const
-{
- return (m_refData != NULL && M_BITMAP->m_surface);
+ wxFAIL_MSG( "not implemented" );
}
-bool wxBitmap::operator==(const wxBitmap& bmp) const
+bool wxBitmap::IsOk() const
{
- // FIXME: is this the right way to compare bitmaps?
- return (m_refData == bmp.m_refData);
+ return (m_refData != NULL && M_BITMAP->m_surface);
}
int wxBitmap::GetHeight() const
{
wxCHECK_RET( Ok(), wxT("invalid bitmap") );
+ AllocExclusive();
delete M_BITMAP->m_mask;
M_BITMAP->m_mask = mask;
}
wxImage image;
if ( !image.LoadFile(name, type) || !image.Ok() )
{
- wxLogError("no bitmap handler for type %d defined.", type);
+ wxLogError(_("No bitmap handler for type %d defined."), type);
return false;
}
else
return image.SaveFile(filename, type);
else
{
- wxLogError("no bitmap handler for type %d defined.", type);
+ wxLogError(_("No bitmap handler for type %d defined."), type);
return false;
}
}
wxCHECK_RET( Ok(), wxT("invalid bitmap") );
wxCHECK_RET( GetDepth() > 1 && GetDepth() <= 8, wxT("cannot set palette for bitmap of this depth") );
+ AllocExclusive();
delete M_BITMAP->m_palette;
M_BITMAP->m_palette = NULL;
void wxBitmap::SetHeight(int height)
{
AllocExclusive();
-#warning "todo"
+
+ wxFAIL_MSG( "SetHeight not implemented" );
}
void wxBitmap::SetWidth(int width)
{
AllocExclusive();
-#warning "todo"
+
+ wxFAIL_MSG( "SetWidth not implemented" );
}
void wxBitmap::SetDepth(int depth)
{
+ DFBSurfacePixelFormat format = DepthToFormat(depth);
+ if ( M_BITMAP->m_surface->GetPixelFormat() == format )
+ return;
+
AllocExclusive();
-#warning "todo"
+
+ int w, h;
+ M_BITMAP->m_surface->GetSize(&w, &h);
+ wxIDirectFBSurfacePtr s = CreateSurfaceWithFormat(w, h, format);
+ if ( !s )
+ return;
+ if ( !s->SetBlittingFlags(DSBLIT_NOFX) )
+ return;
+ if ( !s->Blit(M_BITMAP->m_surface->GetRaw(), NULL, 0, 0) )
+ return;
+
+ M_BITMAP->m_surface = s;
}
wxIDirectFBSurfacePtr wxBitmap::GetDirectFBSurface() const
projects / wxWidgets.git / blobdiff