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
2020-01-11 11:51:04 +01:00
parent 42cd76baf2 fd5cdce3d0
commit 62c18b4921
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rtengine/iptransform.cc
View File

@@ -1006,11 +1006,6 @@ void ImProcFunctions::transformGeneral(bool highQuality, Imagefloat *original, I
calcPCVignetteParams(fW, fH, oW, oH, params->pcvignette, params->crop, pcv); calcPCVignetteParams(fW, fH, oW, oH, params->pcvignette, params->crop, pcv);
} }
const std::array<const float* const*, 3> chOrig = {
original->r.ptrs,
original->g.ptrs,
original->b.ptrs
};
const std::array<float* const*, 3> chTrans = { const std::array<float* const*, 3> chTrans = {
transformed->r.ptrs, transformed->r.ptrs,
transformed->g.ptrs, transformed->g.ptrs,
@@ -1068,6 +1063,13 @@ void ImProcFunctions::transformGeneral(bool highQuality, Imagefloat *original, I
logEncode(original, original, multiThread); logEncode(original, original, multiThread);
} }
} }
const std::array<const float* const*, 3> chOrig = {
original->r.ptrs,
original->g.ptrs,
original->b.ptrs
};
// main cycle // main cycle
#ifdef _OPENMP #ifdef _OPENMP
#pragma omp parallel for schedule(dynamic, 16) if(multiThread) #pragma omp parallel for schedule(dynamic, 16) if(multiThread)

2
rtgui/epd.cc
View File

@@ -69,6 +69,7 @@ void EdgePreservingDecompositionUI::read(const ProcParams *pp, const ParamsEdite
setEnabled(pp->epd.enabled); setEnabled(pp->epd.enabled);
strength->set_sensitive (true); strength->set_sensitive (true);
gamma->set_sensitive (true);
if(pp->wavelet.enabled) { if(pp->wavelet.enabled) {
if(pp->wavelet.tmrs == 0) { if(pp->wavelet.tmrs == 0) {
@@ -98,6 +99,7 @@ void EdgePreservingDecompositionUI::write(ProcParams *pp, ParamsEdited *pedited)
pp->epd.reweightingIterates = reweightingIterates->getValue(); pp->epd.reweightingIterates = reweightingIterates->getValue();
pp->epd.enabled = getEnabled(); pp->epd.enabled = getEnabled();
strength->set_sensitive (true); strength->set_sensitive (true);
gamma->set_sensitive (true);
if(pp->wavelet.enabled) { if(pp->wavelet.enabled) {
if(pp->wavelet.tmrs == 0) { if(pp->wavelet.tmrs == 0) {