liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into pixelshift

Browse Source
This commit is contained in:
heckflosse
2017-01-20 21:13:50 +01:00
parent 8d40dbdc0b c94e017d90
commit 1949ba1774
102 changed files with 4149 additions and 3327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rtgui/cropwindow.cc
View File

@@ -2086,12 +2086,12 @@ void CropWindow::updateHoveredPicker (rtengine::Coord *imgPos)
hoveredPicker->setValidity (validity);
{
MyMutex::MyLock lock(cropHandler.cimg);
MyMutex::MyLock lock(cropHandler.cimg);
if (validity == LockableColorPicker::Validity::INSIDE) {
cropHandler.colorPick(cropPos, r, g, b, rpreview, gpreview, bpreview, hoveredPicker->getSize());
hoveredPicker->setRGB (r, g, b, rpreview, gpreview, bpreview);
}
if (validity == LockableColorPicker::Validity::INSIDE) {
cropHandler.colorPick(cropPos, r, g, b, rpreview, gpreview, bpreview, hoveredPicker->getSize());
hoveredPicker->setRGB (r, g, b, rpreview, gpreview, bpreview);
}
}
}
void CropWindow::changeZoom (int zoom, bool notify, int centerx, int centery)