#include "wx/colour.h"
#include "wx/image.h"
-#warning "move this to common"
-#include "wx/xpmdecod.h"
-
#include "wx/dfb/private.h"
//-----------------------------------------------------------------------------
// helpers
//-----------------------------------------------------------------------------
+// pitch = stride = # of bytes between the start of N-th line and (N+1)-th line
+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 - 3 * w;
+ unsigned dst_advance = dst_pitch - 3 * w;
+ for ( unsigned y = 0; y < h; y++, src += src_advance, dst += dst_advance )
+ {
+ for ( unsigned x = 0; x < w; x++, src += 3, dst += 3 )
+ {
+ // copy with RGB -> BGR translation:
+ dst[0] = src[2];
+ dst[1] = src[1];
+ dst[2] = src[0];
+ }
+ }
+}
+
+static void CopySurfaceToImage(const wxIDirectFBSurfacePtr& surface,
+ const wxImage& image)
+{
+ wxCHECK_RET( surface->GetPixelFormat() == DSPF_RGB24,
+ _T("unexpected pixel format") );
+
+ wxIDirectFBSurface::Locked locked(surface, DSLF_READ);
+ wxCHECK_RET( locked.ptr, _T("failed to lock surface") );
+
+ CopyPixelsAndSwapRGB(image.GetWidth(), image.GetHeight(),
+ (unsigned char*)locked.ptr, locked.pitch,
+ image.GetData(), image.GetWidth() * 3);
+}
+
+static void CopyImageToSurface(const wxImage& image,
+ const wxIDirectFBSurfacePtr& surface)
+{
+ wxCHECK_RET( surface->GetPixelFormat() == DSPF_RGB24,
+ _T("unexpected pixel format") );
+
+ wxIDirectFBSurface::Locked locked(surface, DSLF_WRITE);
+ wxCHECK_RET( locked.ptr, _T("failed to lock surface") );
+
+ CopyPixelsAndSwapRGB(image.GetWidth(), image.GetHeight(),
+ image.GetData(), image.GetWidth() * 3,
+ (unsigned char*)locked.ptr, locked.pitch);
+}
+
// Creates a surface that will use wxImage's pixel data (RGB only)
static wxIDirectFBSurfacePtr CreateSurfaceForImage(const wxImage& image)
{
// into a temporary RGBA surface
wxCHECK_MSG( !image.HasAlpha(), NULL, _T("alpha channel not supported") );
+ // 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
DFBSurfaceDescription desc;
desc.flags = (DFBSurfaceDescriptionFlags)
- (DSDESC_CAPS | DSDESC_WIDTH | DSDESC_HEIGHT | DSDESC_PIXELFORMAT |
- DSDESC_PREALLOCATED);
+ (DSDESC_CAPS | DSDESC_WIDTH | DSDESC_HEIGHT | DSDESC_PIXELFORMAT);
desc.caps = DSCAPS_NONE;
desc.width = image.GetWidth();
desc.height = image.GetHeight();
desc.pixelformat = DSPF_RGB24;
- desc.preallocated[0].data = image.GetData();
- desc.preallocated[0].pitch = 3 * desc.width;
return wxIDirectFB::Get()->CreateSurface(&desc);
}
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)
return Create(wxIDirectFB::Get()->CreateSurface(&desc));
}
-#warning "FIXME: move this to common code"
-bool wxBitmap::CreateFromXpm(const char **bits)
-{
- 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") );
-
- *this = wxBitmap(img);
-
- return true;
-#else
- wxFAIL_MSG( _T("creating bitmaps from XPMs not supported") );
- return false;
-#endif // wxUSE_IMAGE && wxUSE_XPM
-}
-
#if wxUSE_IMAGE
wxBitmap::wxBitmap(const wxImage& image, int depth)
{
return;
// then copy the image to it:
- wxIDirectFBSurfacePtr src(CreateSurfaceForImage(image));
wxIDirectFBSurfacePtr dst = M_BITMAP->m_surface;
- if ( !dst->SetBlittingFlags(DSBLIT_NOFX) )
- return;
- if ( !dst->Blit(src->GetRaw(), NULL, 0, 0) )
- return;
+ if ( dst->GetPixelFormat() == DSPF_RGB24 )
+ {
+ CopyImageToSurface(image, dst);
+ }
+ else
+ {
+ // 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(), _T("image masks are ignored for now") );
wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") );
wxImage img(GetWidth(), GetHeight());
- wxIDirectFBSurfacePtr dst(CreateSurfaceForImage(img));
wxIDirectFBSurfacePtr src = M_BITMAP->m_surface;
- if ( !dst->SetBlittingFlags(DSBLIT_NOFX) )
- return wxNullImage;
- if ( !dst->Blit(src->GetRaw(), NULL, 0, 0) )
- return wxNullImage;
+ if ( src->GetPixelFormat() == DSPF_RGB24 )
+ {
+ CopySurfaceToImage(src, img);
+ }
+ else
+ {
+ // 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, _T("bitmap masks are ignored for now") );
wxFAIL_MSG( _T("not implemented") );
}
-bool wxBitmap::Ok() const
+bool wxBitmap::IsOk() const
{
return (m_refData != NULL && M_BITMAP->m_surface);
}
-bool wxBitmap::operator==(const wxBitmap& bmp) const
-{
- // FIXME: is this the right way to compare bitmaps?
- return (m_refData == bmp.m_refData);
-}
-
int wxBitmap::GetHeight() const
{
wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") );
{
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;
projects / wxWidgets.git / blobdiff