Revert "capture sharpening: early exit if Autocontrast is changed from true to false, #5412"
This reverts commit b72d4e27eb935e2894933016587a1bd386b5539c.
This commit is contained in:
parent
b72d4e27eb
commit
205db936f9
@ -461,7 +461,6 @@ RawImageSource::RawImageSource ()
|
|||||||
, greenCache(nullptr)
|
, greenCache(nullptr)
|
||||||
, redCache(nullptr)
|
, redCache(nullptr)
|
||||||
, blueCache(nullptr)
|
, blueCache(nullptr)
|
||||||
, captureSharpeningAutoContrast(false)
|
|
||||||
, rawDirty(true)
|
, rawDirty(true)
|
||||||
, histMatchingParams(new procparams::ColorManagementParams)
|
, histMatchingParams(new procparams::ColorManagementParams)
|
||||||
{
|
{
|
||||||
@ -5004,11 +5003,7 @@ void RawImageSource::getRawValues(int x, int y, int rotate, int &R, int &G, int
|
|||||||
void RawImageSource::captureSharpening(const procparams::SharpeningParams &sharpeningParams, bool showMask, double &conrastThreshold) {
|
void RawImageSource::captureSharpening(const procparams::SharpeningParams &sharpeningParams, bool showMask, double &conrastThreshold) {
|
||||||
BENCHFUN
|
BENCHFUN
|
||||||
|
|
||||||
if (!sharpeningParams.autoContrast && captureSharpeningAutoContrast) {
|
|
||||||
captureSharpeningAutoContrast = false;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
captureSharpeningAutoContrast = sharpeningParams.autoContrast;
|
|
||||||
if (plistener) {
|
if (plistener) {
|
||||||
plistener->setProgressStr(M("TP_PDSHARPENING_LABEL"));
|
plistener->setProgressStr(M("TP_PDSHARPENING_LABEL"));
|
||||||
plistener->setProgress(0.0);
|
plistener->setProgress(0.0);
|
||||||
|
@ -94,7 +94,6 @@ protected:
|
|||||||
array2D<float>* redCache;
|
array2D<float>* redCache;
|
||||||
// the interpolated blue plane:
|
// the interpolated blue plane:
|
||||||
array2D<float>* blueCache;
|
array2D<float>* blueCache;
|
||||||
bool captureSharpeningAutoContrast;
|
|
||||||
bool rawDirty;
|
bool rawDirty;
|
||||||
float psRedBrightness[4];
|
float psRedBrightness[4];
|
||||||
float psGreenBrightness[4];
|
float psGreenBrightness[4];
|
||||||
|
Loading…
x
Reference in New Issue
Block a user