Fully check thumb data size (#3529)

Also, take rotation into account when falling back to
`Thumbnail::loadFromRaw()`.
This commit is contained in:
Flössie
2016-12-13 20:44:05 +01:00
parent 1f080e0438
commit 23f17bd9bc
3 changed files with 50 additions and 17 deletions

View File

@@ -2085,12 +2085,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)