Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not use variable-length array in WXQT wxRegion

Browse Source 
This is not supported by MSVC compiler.
This commit is contained in:
Maarten Bent
2018-09-25 19:45:42 +02:00
parent 1dfe088b4d
commit f5b4d707b8
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/qt/region.cpp
View File

@@ -10,6 +10,7 @@
#include "wx/region.h" #include "wx/region.h"
#include "wx/bitmap.h" #include "wx/bitmap.h"
#include "wx/scopedarray.h"
#include "wx/qt/private/converter.h" #include "wx/qt/private/converter.h"
#include "wx/qt/private/utils.h" #include "wx/qt/private/utils.h"
@@ -106,8 +107,8 @@ wxRegion::wxRegion(const wxBitmap& bmp, const wxColour& transp, int tolerance)
return; return;
} }
unsigned char raw[bmp.GetWidth()*bmp.GetHeight()]; wxScopedArray<unsigned char> raw(bmp.GetWidth()*bmp.GetHeight());
memset(raw, 0, bmp.GetWidth()*bmp.GetHeight()); memset(raw.get(), 0, bmp.GetWidth()*bmp.GetHeight());
QImage img(bmp.GetHandle()->toImage()); QImage img(bmp.GetHandle()->toImage());
int r = transp.Red(), g = transp.Green(), b = transp.Blue(); int r = transp.Red(), g = transp.Green(), b = transp.Blue();
@@ -125,7 +126,7 @@ wxRegion::wxRegion(const wxBitmap& bmp, const wxColour& transp, int tolerance)
} }
} }
m_refData = new wxRegionRefData(QBitmap::fromData(bmp.GetHandle()->size(), raw)); m_refData = new wxRegionRefData(QBitmap::fromData(bmp.GetHandle()->size(), raw.get()));
} }
bool wxRegion::IsEmpty() const bool wxRegion::IsEmpty() const