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

Merge branch 'dev' into newlocallab

Browse Source
This commit is contained in:
Ingo Weyrich
2019-11-04 23:01:33 +01:00
parent 91b80b23d2 ec5eaf9cea
commit 033d9fe02a
395 changed files with 2523 additions and 2740 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
rtengine/tmo_fattal02.cc
View File

@@ -50,31 +50,33 @@
* $Id: tmo_fattal02.cpp,v 1.3 2008/11/04 23:43:08 rafm Exp $
*/
#ifdef _OPENMP
#include <omp.h>
#endif
#include <algorithm>
#include <cstdio>
#include <iostream>
#include <iterator>
#include <vector>
#include <algorithm>
#include <limits>
#include <vector>
#include <math.h>
#include <assert.h>
#include <fftw3.h>
#include <math.h>
#include "array2D.h"
#include "improcfun.h"
#include "settings.h"
#include "color.h"
#include "iccstore.h"
#include "StopWatch.h"
#include "sleef.c"
#include "imagefloat.h"
#include "improcfun.h"
#include "opthelper.h"
#include "rt_algo.h"
#include "rescale.h"
#include "procparams.h"
#include "rescale.h"
#include "rt_algo.h"
#include "settings.h"
#include "sleef.h"
#include "StopWatch.h"
namespace rtengine
{
@@ -83,7 +85,6 @@ namespace rtengine
* RT code
******************************************************************************/
extern const Settings *settings;
extern MyMutex *fftwMutex;
using namespace std;
@@ -1102,7 +1103,7 @@ void ImProcFunctions::ToneMapFattal02(Imagefloat *rgb, const FattalToneMappingPa
float oldMedian;
const float percentile = float(LIM(fatParams.anchor, 1, 100)) / 100.f;
findMinMaxPercentile(Yr.data(), Yr.getRows() * Yr.getCols(), percentile, oldMedian, percentile, oldMedian, multiThread);
findMinMaxPercentile (Yr.data(), static_cast<size_t>(Yr.getRows()) * Yr.getCols(), percentile, oldMedian, percentile, oldMedian, multiThread);
// median filter on the deep shadows, to avoid boosting noise
// because w2 >= w and h2 >= h, we can use the L buffer as temporary buffer for Median_Denoise()
int w2 = find_fast_dim(w) + 1;
@@ -1145,7 +1146,7 @@ void ImProcFunctions::ToneMapFattal02(Imagefloat *rgb, const FattalToneMappingPa
const float wr = float(w2) / float(w);
float newMedian;
findMinMaxPercentile(L.data(), L.getRows() * L.getCols(), percentile, newMedian, percentile, newMedian, multiThread);
findMinMaxPercentile (L.data(), static_cast<size_t>(L.getRows()) * L.getCols(), percentile, newMedian, percentile, newMedian, multiThread);
const float scale = (oldMedian == 0.f || newMedian == 0.f) ? 65535.f : (oldMedian / newMedian); // avoid Nan
#ifdef _OPENMP