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

wxqt: correct formatting and casting, no functional change

Browse Source
This commit is contained in:
Sean D'Epagnier
2016-09-12 12:24:52 -04:00
committed by Vadim Zeitlin
parent 42144b93b7
commit 169d61edb7
20 changed files with 38 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/qt/region.cpp
View File

@@ -96,12 +96,12 @@ wxRegion::wxRegion(const wxBitmap& bmp)
wxRegion::wxRegion(const wxBitmap& bmp, const wxColour& transp, int tolerance)
{
if(!bmp.GetHandle()) {
if ( !bmp.GetHandle() ) {
m_refData = new wxRegionRefData();
return;
}
if(tolerance == 0) {
if ( tolerance == 0 ) {
m_refData = new wxRegionRefData(bmp.GetHandle()->createMaskFromColor(transp.GetQColor()));
return;
}
@@ -111,15 +111,17 @@ wxRegion::wxRegion(const wxBitmap& bmp, const wxColour& transp, int tolerance)
QImage img(bmp.GetHandle()->toImage());
int r = transp.Red(), g = transp.Green(), b = transp.Blue();
for(int y=0; y<img.height(); y++) {
for(int x=0; x<img.width(); x++) {
for(int y=0; y<img.height(); y++)
{
for(int x=0; x<img.width(); x++)
{
QColor c = img.pixel(x, y);
if(abs(c.red() - r) > tolerance ||
if ( abs(c.red() - r ) > tolerance ||
abs(c.green() - g) > tolerance ||
abs(c.blue() - b) > tolerance) {
int ind = y*img.width()+x;
raw[ind>>3] |= 1<<(ind&7);
}
}
}
}