wxImage::Ok() now returns false for images with 0 width or height
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9546 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -525,7 +525,10 @@ unsigned char wxImage::GetBlue( int x, int y ) const
|
|||||||
|
|
||||||
bool wxImage::Ok() const
|
bool wxImage::Ok() const
|
||||||
{
|
{
|
||||||
return (M_IMGDATA && M_IMGDATA->m_ok);
|
// image of 0 width or height can't be considered ok - at least because it
|
||||||
|
// causes crashes in ConvertToBitmap() if we don't catch it in time
|
||||||
|
wxImageRefData *data = M_IMGDATA;
|
||||||
|
return data && data->m_ok && data->m_width && data->m_height;
|
||||||
}
|
}
|
||||||
|
|
||||||
char unsigned *wxImage::GetData() const
|
char unsigned *wxImage::GetData() const
|
||||||
|
Reference in New Issue
Block a user