// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
-#ifndef _WX_RAWBMP_H_BASE_
-#define _WX_RAWBMP_H_BASE_
+#ifndef _WX_RAWBMP_H_
+#define _WX_RAWBMP_H_
#include "wx/image.h"
+#include "wx/bitmap.h"
// ----------------------------------------------------------------------------
// Abstract Pixel API
}
*/
-#ifdef __VISUALC__
- // VC++ gives an absolutely harmless warning for wxPixelData<wxBitmap> ctor
- #pragma warning(push)
- #pragma warning(disable: 4355) // 'this' used in initializer list
-#endif
-
/*
- Note: we do not use WXDLLEXPORT with classes in this file because VC++ has
+ Note: we do not use WXDLLIMPEXP_CORE with classes in this file because VC++ has
problems with exporting inner class defined inside a specialization of a
template class from a DLL. Besides, as all the methods are inline it's not
really necessary to put them in DLL at all.
#define wxPIXEL_FORMAT_ALPHA 3
#elif defined(__WXGTK__)
- // Under GTK+ 2.X we use GdkPixbuf, which should be RGBA
+ // Under GTK+ 2.X we use GdkPixbuf, which is standard RGB or RGBA
typedef wxPixelFormat<unsigned char, 24, 0, 1, 2> wxNativePixelFormat;
+ #define wxPIXEL_FORMAT_ALPHA 3
+#elif defined(__WXDFB__)
+ // Under DirectFB, RGB components are reversed, they're in BGR order
+ typedef wxPixelFormat<unsigned char, 24, 2, 1, 0> wxNativePixelFormat;
+
#define wxPIXEL_FORMAT_ALPHA 3
#endif
typedef wxImagePixelFormat PixelFormat;
// the type of the pixel components
- typedef typename dummyPixelFormat::ChannelType ChannelType;
+ typedef typename PixelFormat::ChannelType ChannelType;
// the pixel data we're working with
typedef
// data access
// -----------
- // access to invidividual colour components
+ // access to individual colour components
ChannelType& Red() { return m_pRGB[PixelFormat::RED]; }
ChannelType& Green() { return m_pRGB[PixelFormat::GREEN]; }
ChannelType& Blue() { return m_pRGB[PixelFormat::BLUE]; }
ChannelType& Alpha() { return *m_pAlpha; }
+ // address the pixel contents directly (always RGB, without alpha)
+ //
+ // this can't be used to modify the image as assigning a 32bpp
+ // value to 24bpp pixel would overwrite an extra byte in the next
+ // pixel or beyond the end of image
+ const typename PixelFormat::PixelType& Data()
+ { return *(typename PixelFormat::PixelType *)m_pRGB; }
+
// private: -- see comment in the beginning of the file
// pointer into RGB buffer
{
m_width = image.GetWidth();
m_height = image.GetHeight();
- m_stride = Iterator::SizePixel * m_width;
+ m_stride = Iterator::PixelFormat::SizePixel * m_width;
}
// initializes us with the given region of the specified image
const wxPoint& pt,
const wxSize& sz) : m_image(image), m_pixels(image)
{
- m_stride = Iterator::SizePixel * m_width;
+ m_stride = Iterator::PixelFormat::SizePixel * m_width;
InitRect(pt, sz);
}
wxPixelDataIn(ImageType& image,
const wxRect& rect) : m_image(image), m_pixels(image)
{
- m_stride = Iterator::SizePixel * m_width;
+ m_stride = Iterator::PixelFormat::SizePixel * m_width;
InitRect(rect.GetPosition(), rect.GetSize());
}
bmp.GetRawData(data, PixelFormat::BitsPerPixel);
}
+ // default constructor
+ Iterator()
+ {
+ m_ptr = NULL;
+ }
+
// return true if this iterator is valid
bool IsOk() const { return m_ptr != NULL; }
// address the pixel contents directly
//
// warning: the format is platform dependent
+ //
+ // warning 2: assigning to Data() only works correctly for 16bpp or
+ // 32bpp formats but using it for 24bpp ones overwrites
+ // one extra byte and so can't be done
typename PixelFormat::PixelType& Data()
{ return *(typename PixelFormat::PixelType *)m_ptr; }
// dtor unlocks the bitmap
~wxPixelDataIn()
{
- m_bmp.UngetRawData(*this);
+ if ( m_pixels.IsOk() )
+ {
+#if defined(__WXMSW__) || defined(__WXMAC__)
+ // this is a hack to mark wxBitmap as using alpha channel
+ if ( Format::HasAlpha )
+ m_bmp.UseAlpha();
+#endif
+ m_bmp.UngetRawData(*this);
+ }
+ // else: don't call UngetRawData() if GetRawData() failed
}
- // call this to indicate that we should use the alpha channel
- void UseAlpha() { m_bmp.UseAlpha(); }
+#if WXWIN_COMPATIBILITY_2_8
+ // not needed anymore, calls to it should be simply removed
+ wxDEPRECATED_INLINE( void UseAlpha(), wxEMPTY_PARAMETER_VALUE )
+#endif
// private: -- see comment in the beginning of the file
}
};
};
+
#endif //wxUSE_GUI
-#ifdef __VISUALC__
- // typedef-name 'foo' used as synonym for class-name 'bar'
- // (VC++ gives this warning each time wxPixelData::Base is used but it
- // doesn't make any sense here -- what's wrong with using typedef instead
- // of class, this is what it is here for!)
- #pragma warning(disable: 4097)
-#endif // __VISUALC__
+// FIXME-VC6: VC6 doesn't like typename in default template parameters while
+// it is necessary with standard-conforming compilers, remove this
+// #define and just use typename when we drop VC6 support
+#if defined(__VISUALC__) && !wxCHECK_VISUALC_VERSION(7)
+ #define wxTYPENAME_IN_TEMPLATE_DEFAULT_PARAM
+#else
+ #define wxTYPENAME_IN_TEMPLATE_DEFAULT_PARAM typename
+#endif
-template <class Image, class PixelFormat = wxPixelFormatFor<Image> >
+template <class Image,
+ class PixelFormat = wxTYPENAME_IN_TEMPLATE_DEFAULT_PARAM
+ wxPixelFormatFor<Image>::Format >
class wxPixelData :
public wxPixelDataOut<Image>::template wxPixelDataIn<PixelFormat>
{
}
};
-
// some "predefined" pixel data classes
#if wxUSE_IMAGE
typedef wxPixelData<wxImage> wxImagePixelData;
{
};
-#ifdef __VISUALC__
- #pragma warning(pop)
-#endif
-
-#endif // _WX_RAWBMP_H_BASE_
-
+#endif // _WX_RAWBMP_H_
projects / wxWidgets.git / blobdiff