X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2bdba43f026251eafe1cfe3ad35ee4ca08f9253b..51623cc53f350935337e57930eaaf1afe9a48c3b:/include/wx/rawbmp.h?ds=inline diff --git a/include/wx/rawbmp.h b/include/wx/rawbmp.h index 6a15042c23..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,13 +413,17 @@ 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) - typename PixelFormat::PixelType& Data() + // + // 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 @@ -591,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]; } @@ -600,6 +610,10 @@ struct 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; } @@ -680,7 +694,18 @@ struct wxPixelDataOut #endif //wxUSE_GUI -template ::Format > +// 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 ::Format > class wxPixelData : public wxPixelDataOut::template wxPixelDataIn { @@ -730,4 +755,5 @@ struct wxPixelIterator : public wxPixelData::Iterator { }; +#endif // wxHAS_RAW_BITMAP #endif // _WX_RAWBMP_H_