synced with master (merged master into retinex)

This commit is contained in:
Beep6581
2015-10-17 12:27:26 +02:00
20 changed files with 874 additions and 649 deletions

View File

@@ -226,13 +226,11 @@ void ImProcCoordinator::updatePreviewImage (int todo, Crop* cropCall)
}
imgsrc->demosaic( rp);//enabled demosaic
// if a demosaic happened we should also call getimage later, so we need to set the M_INIT flag
todo |= M_INIT;
if (highDetailNeeded) {
highDetailRawComputed = true;
if (params.toneCurve.hrenabled && params.toneCurve.method == "Color") {
todo |= M_INIT;
}
} else {
highDetailRawComputed = false;
}