X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/284f2b59db428e6ab05d31ff26b12043b6d42ff3..2a45803fc3877afd0ae3ce356dfe216505165882:/include/wx/rawbmp.h diff --git a/include/wx/rawbmp.h b/include/wx/rawbmp.h index 0815f09f17..6e000ec143 100644 --- a/include/wx/rawbmp.h +++ b/include/wx/rawbmp.h @@ -9,10 +9,15 @@ // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// -#ifndef _WX_RAWBMP_H_BASE_ -#define _WX_RAWBMP_H_BASE_ +#ifndef _WX_RAWBMP_H_ +#define _WX_RAWBMP_H_ + +#include "wx/defs.h" + +#ifdef wxHAS_RAW_BITMAP #include "wx/image.h" +#include "wx/bitmap.h" // ---------------------------------------------------------------------------- // Abstract Pixel API @@ -71,10 +76,12 @@ } */ -#ifdef __VISUALC__ - // VC++ gives an absolutely harmless warning for wxPixelData ctor - #pragma warning(disable: 4355) // 'this' used in initializer list -#endif +/* + 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. + */ // ---------------------------------------------------------------------------- // wxPixelFormat @@ -107,7 +114,7 @@ template -struct WXDLLEXPORT wxPixelFormat +struct wxPixelFormat { // iterator over pixels is usually of type "ChannelType *" typedef Channel ChannelType; @@ -146,7 +153,7 @@ typedef wxPixelFormat wxImagePixelFormat; // 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 wxNativePixelFormat; #define wxPIXEL_FORMAT_ALPHA 3 @@ -162,9 +169,19 @@ typedef wxPixelFormat wxImagePixelFormat; #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 wxNativePixelFormat; + + #define wxPIXEL_FORMAT_ALPHA 3 +#elif defined(__WXPM__) + // Under PM, we can use standard RGB or RGBA typedef wxPixelFormat wxNativePixelFormat; + #define wxPIXEL_FORMAT_ALPHA 3 +#elif defined(__WXDFB__) + // Under DirectFB, RGB components are reversed, they're in BGR order + typedef wxPixelFormat wxNativePixelFormat; + #define wxPIXEL_FORMAT_ALPHA 3 #endif @@ -186,7 +203,7 @@ template struct wxPixelFormatFor; // classes (wxBitmap...) will result in compile errors which is exactly what we // want template <> -struct WXDLLEXPORT wxPixelFormatFor +struct wxPixelFormatFor { typedef wxImagePixelFormat Format; }; @@ -200,7 +217,7 @@ struct WXDLLEXPORT wxPixelFormatFor 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 @@ -268,10 +285,10 @@ protected: // we need to define this skeleton template to mollify VC++ template -struct WXDLLEXPORT wxPixelDataOut +struct wxPixelDataOut { template - class WXDLLEXPORT wxPixelDataIn + class wxPixelDataIn { public: class Iterator { }; @@ -282,13 +299,14 @@ struct WXDLLEXPORT wxPixelDataOut // 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 +struct wxPixelDataOut { // NB: this is a template class even though it doesn't use its template // parameter because otherwise wxPixelData couldn't compile template - class WXDLLEXPORT wxPixelDataIn : public wxPixelDataBase + class wxPixelDataIn : public wxPixelDataBase { + public: // the type of the class we're working with typedef wxImage ImageType; @@ -300,9 +318,6 @@ struct WXDLLEXPORT wxPixelDataOut // the pixel format we use typedef wxImagePixelFormat PixelFormat; - // the type of the pixel components - typedef typename dummyPixelFormat::ChannelType ChannelType; - // the pixel data we're working with typedef wxPixelDataOut::wxPixelDataIn PixelData; @@ -397,11 +412,19 @@ struct WXDLLEXPORT wxPixelDataOut // data access // ----------- - // access to invidividual 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; } + // access to individual colour components + PixelFormat::ChannelType& Red() { return m_pRGB[PixelFormat::RED]; } + PixelFormat::ChannelType& Green() { return m_pRGB[PixelFormat::GREEN]; } + PixelFormat::ChannelType& Blue() { return m_pRGB[PixelFormat::BLUE]; } + PixelFormat::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 @@ -417,7 +440,7 @@ struct WXDLLEXPORT wxPixelDataOut { 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 @@ -425,7 +448,7 @@ struct WXDLLEXPORT wxPixelDataOut 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); } @@ -434,7 +457,7 @@ struct WXDLLEXPORT wxPixelDataOut 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()); } @@ -469,16 +492,16 @@ struct WXDLLEXPORT wxPixelDataOut // wxPixelData specialization for wxBitmap: here things are more interesting as // we also have to support different pixel formats template <> -struct WXDLLEXPORT wxPixelDataOut +struct wxPixelDataOut { template - 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 @@ -517,6 +540,12 @@ struct WXDLLEXPORT wxPixelDataOut 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; } @@ -572,7 +601,7 @@ struct WXDLLEXPORT wxPixelDataOut // data access // ----------- - // access to invidividual colour components + // access to individual colour components ChannelType& Red() { return m_ptr[PixelFormat::RED]; } ChannelType& Green() { return m_ptr[PixelFormat::GREEN]; } ChannelType& Blue() { return m_ptr[PixelFormat::BLUE]; } @@ -581,6 +610,10 @@ struct WXDLLEXPORT wxPixelDataOut // 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; } @@ -622,11 +655,22 @@ struct WXDLLEXPORT wxPixelDataOut // 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 @@ -647,17 +691,21 @@ struct WXDLLEXPORT wxPixelDataOut } }; }; + #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 > +template ::Format > class wxPixelData : public wxPixelDataOut::template wxPixelDataIn { @@ -676,7 +724,6 @@ public: } }; - // some "predefined" pixel data classes #if wxUSE_IMAGE typedef wxPixelData wxImagePixelData; @@ -684,6 +731,7 @@ typedef wxPixelData wxImagePixelData; #if wxUSE_GUI typedef wxPixelData wxNativePixelData; typedef wxPixelData wxAlphaPixelData; + #endif //wxUSE_GUI // ---------------------------------------------------------------------------- @@ -703,14 +751,9 @@ typedef wxPixelData wxAlphaPixelData; partial template specialization then and neither VC6 nor VC7 provide it. */ template < class Image, class PixelFormat = wxPixelFormatFor > -struct WXDLLEXPORT wxPixelIterator : wxPixelData::Iterator +struct wxPixelIterator : public wxPixelData::Iterator { }; -#ifdef __VISUALC__ - #pragma warning(default: 4355) - #pragma warning(default: 4097) -#endif - -#endif // _WX_RAWBMP_H_BASE_ - +#endif // wxHAS_RAW_BITMAP +#endif // _WX_RAWBMP_H_