AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

forbid modifying wxImage by assigning to wxImagePixelData::Iterator::Data(), this doesn't work correctly

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54774 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2008-07-23 23:26:28 +00:00
parent 60235673ec
commit 4800a07000
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/wx/rawbmp.h
View File

@ -413,7 +413,11 @@ struct wxPixelDataOut<wxImage>
ChannelType& Alpha() { return *m_pAlpha; } ChannelType& Alpha() { return *m_pAlpha; }
// address the pixel contents directly (always RGB, without alpha) // 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; } { return *(typename PixelFormat::PixelType *)m_pRGB; }
// private: -- see comment in the beginning of the file // private: -- see comment in the beginning of the file
@ -600,6 +604,10 @@ struct wxPixelDataOut<wxBitmap>
// address the pixel contents directly // address the pixel contents directly
// //
// warning: the format is platform dependent // 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() typename PixelFormat::PixelType& Data()
{ return *(typename PixelFormat::PixelType *)m_ptr; } { return *(typename PixelFormat::PixelType *)m_ptr; }