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

merge with dev

Browse Source
This commit is contained in:
Desmis
2019-08-30 08:23:12 +02:00
parent 2068871b6e a5cba6261a
commit a9cb07de24
4 changed files with 43 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rtengine/improccoordinator.cc
View File

@@ -1719,13 +1719,13 @@ void ImProcCoordinator::process()
while (changeSinceLast) {
const bool panningRelatedChange =
params->toneCurve != nextParams->toneCurve
params->toneCurve.isPanningRelatedChange(nextParams->toneCurve)
|| params->labCurve != nextParams->labCurve
|| params->localContrast != nextParams->localContrast
|| params->rgbCurves != nextParams->rgbCurves
|| params->colorToning != nextParams->colorToning
|| params->vibrance != nextParams->vibrance
|| params->wb != nextParams->wb
|| params->wb.isPanningRelatedChange(nextParams->wb)
|| params->colorappearance != nextParams->colorappearance
|| params->epd != nextParams->epd
|| params->fattal != nextParams->fattal

38
rtengine/procparams.cc
View File

@@ -330,6 +330,29 @@ ToneCurveParams::ToneCurveParams() :
{
}
bool ToneCurveParams::isPanningRelatedChange(const ToneCurveParams& other) const
{
return !
(autoexp == other.autoexp
&& clip == other.clip
&& hrenabled == other.hrenabled
&& method == other.method
&& expcomp == other.expcomp
&& curve == other.curve
&& curve2 == other.curve2
&& curveMode == other.curveMode
&& curveMode2 == other.curveMode2
&& brightness == other.brightness
&& black == other.black
&& contrast == other.contrast
&& saturation == other.saturation
&& shcompr == other.shcompr
&& hlcompr == other.hlcompr
&& hlcomprthresh == other.hlcomprthresh
&& histmatching == other.histmatching
&& clampOOG == other.clampOOG);
}
bool ToneCurveParams::operator ==(const ToneCurveParams& other) const
{
return
@@ -1210,6 +1233,21 @@ WBParams::WBParams() :
{
}
bool WBParams::isPanningRelatedChange(const WBParams& other) const
{
return !
(enabled == other.enabled
&& ((method == "Camera" && other.method == "Camera")
||
(method == other.method
&& temperature == other.temperature
&& green == other.green
&& equal == other.equal
&& tempBias == other.tempBias)
)
);
}
bool WBParams::operator ==(const WBParams& other) const
{
return

2
rtengine/procparams.h
View File

@@ -284,6 +284,7 @@ struct ToneCurveParams {
ToneCurveParams();
bool isPanningRelatedChange(const ToneCurveParams& other) const;
bool operator ==(const ToneCurveParams& other) const;
bool operator !=(const ToneCurveParams& other) const;
@@ -597,6 +598,7 @@ struct WBParams {
WBParams();
bool isPanningRelatedChange(const WBParams& other) const;
bool operator ==(const WBParams& other) const;
bool operator !=(const WBParams& other) const;

2
rtengine/simpleprocess.cc
View File

@@ -214,7 +214,7 @@ private:
imgsrc->preprocess(params.raw, params.lensProf, params.coarse, params.dirpyrDenoise.enabled);
// After preprocess, run film negative processing if enabled
if (imgsrc->getSensorType() == ST_BAYER && params.filmNegative.enabled) {
if ((imgsrc->getSensorType() == ST_BAYER || (imgsrc->getSensorType() == ST_FUJI_XTRANS)) && params.filmNegative.enabled) {
imgsrc->filmNegativeProcess (params.filmNegative);
}