X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4800a07000d9d830c67a662cf2cdc00980808f0d..a4301b8f14d21b7d28fc4f6a247b740d945ca6dc:/include/wx/rawbmp.h diff --git a/include/wx/rawbmp.h b/include/wx/rawbmp.h index d636d586e5..6e000ec143 100644 --- a/include/wx/rawbmp.h +++ b/include/wx/rawbmp.h @@ -12,6 +12,10 @@ #ifndef _WX_RAWBMP_H_ #define _WX_RAWBMP_H_ +#include "wx/defs.h" + +#ifdef wxHAS_RAW_BITMAP + #include "wx/image.h" #include "wx/bitmap.h" @@ -168,6 +172,11 @@ typedef wxPixelFormat wxImagePixelFormat; // 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 @@ -309,9 +318,6 @@ struct wxPixelDataOut // the pixel format we use typedef wxImagePixelFormat PixelFormat; - // the type of the pixel components - typedef typename PixelFormat::ChannelType ChannelType; - // the pixel data we're working with typedef wxPixelDataOut::wxPixelDataIn PixelData; @@ -407,10 +413,10 @@ struct wxPixelDataOut // ----------- // 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; } + 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) // @@ -595,7 +601,7 @@ struct 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]; } @@ -749,4 +755,5 @@ struct wxPixelIterator : public wxPixelData::Iterator { }; +#endif // wxHAS_RAW_BITMAP #endif // _WX_RAWBMP_H_