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
2017-06-19 12:30:20 +02:00
parent f1a90dad54 a9f769c5d7
commit acd715dd44
90 changed files with 598 additions and 866 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
rtengine/ipwavelet.cc
View File

@@ -923,9 +923,8 @@ SSEFUNCTION void ImProcFunctions::ip_wavelet (LabImage * lab, LabImage * dst, in
ind = 1;
//Flat curve for Contrast=f(H) in levels
FlatCurve* ChCurve = nullptr;//curve C=f(H)
FlatCurve* ChCurve = new FlatCurve(params->wavelet.Chcurve); //curve C=f(H)
bool Chutili = false;
ChCurve = new FlatCurve (params->wavelet.Chcurve);
if (!ChCurve || ChCurve->isIdentity()) {
if (ChCurve) {
@@ -953,9 +952,8 @@ SSEFUNCTION void ImProcFunctions::ip_wavelet (LabImage * lab, LabImage * dst, in
}
//Flat curve for H=f(H) in residual image
FlatCurve* hhCurve = nullptr;//curve H=f(H)
FlatCurve* hhCurve = new FlatCurve(params->wavelet.hhcurve); //curve H=f(H)
bool hhutili = false;
hhCurve = new FlatCurve (params->wavelet.hhcurve);
if (!hhCurve || hhCurve->isIdentity()) {
if (hhCurve) {
@@ -1260,11 +1258,15 @@ SSEFUNCTION void ImProcFunctions::ip_wavelet (LabImage * lab, LabImage * dst, in
omp_set_nested (oldNested);
#endif
if (numtiles > 1) {
dst->CopyFrom (dsttmp);
if(numtiles != 1) {
dst->CopyFrom(dsttmp);
delete dsttmp;
}
#ifdef _DEBUG
delete MunsDebugInfo;
#endif
}
#undef TS
@@ -3400,14 +3402,18 @@ void ImProcFunctions::ContAllAB (LabImage * labco, int maxlvl, float ** varhue,
}
bool useOpacity;
float mulOpacity;
float mulOpacity = 0.f;
if (useChannelA) {
useOpacity = cp.opaRG;
mulOpacity = cp.mulopaRG[level];
if(level < 9) {
mulOpacity = cp.mulopaRG[level];
}
} else {
useOpacity = cp.opaBY;
mulOpacity = cp.mulopaBY[level];
if(level < 9) {
mulOpacity = cp.mulopaBY[level];
}
}
if ((useOpacity && level < 9 && mulOpacity != 0.f) && cp.toningena) { //toning