X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/284f2b59db428e6ab05d31ff26b12043b6d42ff3..333e57d578e9e0fb6555452b5a53698ffd85ee69:/include/wx/rawbmp.h?ds=inline diff --git a/include/wx/rawbmp.h b/include/wx/rawbmp.h index 0815f09f17..377836fc99 100644 --- a/include/wx/rawbmp.h +++ b/include/wx/rawbmp.h @@ -9,8 +9,8 @@ // 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" @@ -71,10 +71,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 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 @@ -107,7 +109,7 @@ template -struct WXDLLEXPORT wxPixelFormat +struct wxPixelFormat { // iterator over pixels is usually of type "ChannelType *" typedef Channel ChannelType; @@ -146,7 +148,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 +164,14 @@ 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(__WXDFB__) + // Under DirectFB, RGB components are reversed, they're in BGR order + typedef wxPixelFormat wxNativePixelFormat; + #define wxPIXEL_FORMAT_ALPHA 3 #endif @@ -186,7 +193,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 +207,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 +275,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 +289,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; @@ -469,16 +477,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 +525,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; } @@ -622,11 +636,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() ); +#endif // private: -- see comment in the beginning of the file @@ -647,15 +672,8 @@ 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__ +#endif //wxUSE_GUI template > class wxPixelData : @@ -676,6 +694,11 @@ public: } }; +#if WXWIN_COMPATIBILITY_2_8 +template +inline void wxPixelDataOut::wxPixelDataIn::UseAlpha() {} +#endif + // some "predefined" pixel data classes #if wxUSE_IMAGE @@ -684,6 +707,7 @@ typedef wxPixelData wxImagePixelData; #if wxUSE_GUI typedef wxPixelData wxNativePixelData; typedef wxPixelData wxAlphaPixelData; + #endif //wxUSE_GUI // ---------------------------------------------------------------------------- @@ -703,14 +727,8 @@ 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 // _WX_RAWBMP_H_