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

Fattal: protect fftwf calls with a mutex (shared also with the denoise routine)

Browse Source 
Initialization of the fftwMutex now happens in rtengine::init()
This commit is contained in:
Alberto Griggio
2017-11-05 13:34:33 +01:00
parent 34ed12c318
commit ceb3ebf24b
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rtengine/FTblockDN.cc
View File

@@ -71,6 +71,8 @@ namespace rtengine
extern const Settings* settings;
extern MyMutex *fftwMutex;
void ImProcFunctions::Median_Denoise(float **src, float **dst, const int width, const int height, const Median medianType, const int iterations, const int numThreads, float **buffer)
{
@@ -445,8 +447,7 @@ SSEFUNCTION void ImProcFunctions::RGB_denoise(int kall, Imagefloat * src, Imagef
return;
}
static MyMutex FftwMutex;
MyMutex::MyLock lock(FftwMutex);
MyMutex::MyLock lock(*fftwMutex);
const nrquality nrQuality = (dnparams.smethod == "shal") ? QUALITY_STANDARD : QUALITY_HIGH;//shrink method
const float qhighFactor = (nrQuality == QUALITY_HIGH) ? 1.f / static_cast<float>( settings->nrhigh) : 1.0f;