// 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"
}
*/
-#ifdef __VISUALC__
- // VC++ gives an absolutely harmless warning for wxPixelData<wxBitmap> ctor
- #pragma warning(disable: 4355) // 'this' used in initializer list
-#endif
+/*
+ Note: we do not use WXDLLEXPORT 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.
+ */
// ----------------------------------------------------------------------------
// wxPixelFormat
size_t Bpp, int R, int G, int B, int A = -1,
class Pixel = wxUint32>
-struct WXDLLEXPORT wxPixelFormat
+struct wxPixelFormat
{
// iterator over pixels is usually of type "ChannelType *"
typedef Channel ChannelType;
// the (most common) native bitmap format without alpha support
#if defined(__WXMSW__)
- // under MSW the RGB components are inversed, they're in BGR order
+ // under MSW the RGB components are reversed, they're in BGR order
typedef wxPixelFormat<unsigned char, 24, 2, 1, 0> wxNativePixelFormat;
#define wxPIXEL_FORMAT_ALPHA 3
#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
// classes (wxBitmap...) will result in compile errors which is exactly what we
// want
template <>
-struct WXDLLEXPORT wxPixelFormatFor<wxImage>
+struct wxPixelFormatFor<wxImage>
{
typedef wxImagePixelFormat Format;
};
wxPixelDataBase is just a helper for wxPixelData: it contains things common
to both wxImage and wxBitmap specializations.
*/
-class WXDLLEXPORT wxPixelDataBase
+class wxPixelDataBase
{
public:
// origin of the rectangular region we represent
// we need to define this skeleton template to mollify VC++
template <class Image>
-struct WXDLLEXPORT wxPixelDataOut
+struct wxPixelDataOut
{
template <class PixelFormat>
- class WXDLLEXPORT wxPixelDataIn
+ class wxPixelDataIn
{
public:
class Iterator { };
// wxPixelData specialization for wxImage: this is the simplest case as we
// don't have to care about different pixel formats here
template <>
-struct WXDLLEXPORT wxPixelDataOut<wxImage>
+struct wxPixelDataOut<wxImage>
{
// NB: this is a template class even though it doesn't use its template
// parameter because otherwise wxPixelData couldn't compile
template <class dummyPixelFormat>
- class WXDLLEXPORT wxPixelDataIn : public wxPixelDataBase
+ class wxPixelDataIn : public wxPixelDataBase
{
+ public:
// the type of the class we're working with
typedef wxImage ImageType;
// wxPixelData specialization for wxBitmap: here things are more interesting as
// we also have to support different pixel formats
template <>
-struct WXDLLEXPORT wxPixelDataOut<wxBitmap>
+struct wxPixelDataOut<wxBitmap>
{
template <class Format>
- class WXDLLEXPORT wxPixelDataIn : public wxPixelDataBase
+ class wxPixelDataIn : public wxPixelDataBase
{
public:
// the type of the class we're working with
typedef wxBitmap ImageType;
- class WXDLLEXPORT Iterator
+ class Iterator
{
public:
// the pixel format we use
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; }
// 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__
+#endif //wxUSE_GUI
template <class Image, class PixelFormat = wxPixelFormatFor<Image> >
class wxPixelData :
}
};
-
// some "predefined" pixel data classes
#if wxUSE_IMAGE
typedef wxPixelData<wxImage> wxImagePixelData;
#if wxUSE_GUI
typedef wxPixelData<wxBitmap, wxNativePixelFormat> wxNativePixelData;
typedef wxPixelData<wxBitmap, wxAlphaPixelFormat> wxAlphaPixelData;
+
#endif //wxUSE_GUI
// ----------------------------------------------------------------------------
partial template specialization then and neither VC6 nor VC7 provide it.
*/
template < class Image, class PixelFormat = wxPixelFormatFor<Image> >
-struct WXDLLEXPORT wxPixelIterator : wxPixelData<Image, PixelFormat>::Iterator
+struct wxPixelIterator : public wxPixelData<Image, PixelFormat>::Iterator
{
};
-#ifdef __VISUALC__
- #pragma warning(default: 4355)
- #pragma warning(default: 4097)
-#endif
-
-#endif // _WX_RAWBMP_H_BASE_
-
+#endif // _WX_RAWBMP_H_
projects / wxWidgets.git / blobdiff