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-02-17 14:50:41 +01:00
parent 03315b496a c85dc2811b
commit 5e66e402fa
15 changed files with 241 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rtengine/demosaic_algos.cc
View File

@@ -388,7 +388,7 @@ void RawImageSource::jdl_interpolate_omp() // from "Lassus"
}
#ifdef _OPENMP
#pragma omp parallel default(none) shared(image,width,height,u,w,v,y,x,z,dif,chr) private(row,col,f,g,indx,c,d,i)
#pragma omp parallel shared(image,width,height,u,w,v,y,x,z,dif,chr) private(row,col,f,g,indx,c,d,i)
#endif
{
#ifdef _OPENMP
@@ -1159,7 +1159,7 @@ void RawImageSource::igv_interpolate(int winw, int winh)
}
#ifdef _OPENMP
#pragma omp parallel default(none) shared(rgb,vdif,hdif,chr)
#pragma omp parallel shared(rgb,vdif,hdif,chr)
#endif
{
__m128 ngv, egv, wgv, sgv, nvv, evv, wvv, svv, nwgv, negv, swgv, segv, nwvv, nevv, swvv, sevv, tempv, temp1v, temp2v, temp3v, temp4v, temp5v, temp6v, temp7v, temp8v;
@@ -1548,7 +1548,7 @@ void RawImageSource::igv_interpolate(int winw, int winh)
}
#ifdef _OPENMP
#pragma omp parallel default(none) shared(rgb,vdif,hdif,chr)
#pragma omp parallel shared(rgb,vdif,hdif,chr)
#endif
{

4
rtengine/ipretinex.cc
View File

@@ -394,7 +394,7 @@ void RawImageSource::MSR(float** luminance, float** originalLuminance, float **e
pond /= log(elogt);
}
auto shmap = ((mapmet == 2 || mapmet == 3 || mapmet == 4) && it == 1) ? new SHMap(W_L, H_L, true) : nullptr;
auto shmap = ((mapmet == 2 || mapmet == 3 || mapmet == 4) && it == 1) ? new SHMap (W_L, H_L) : nullptr;
float *buffer = new float[W_L * H_L];;
@@ -898,7 +898,7 @@ void ImProcFunctions::MSRLocal(int sp, float** luminance, float** templ, const f
pond /= log(elogt);
}
auto shmap = mapmet == 4 ? new SHMap(W_L, H_L, true) : nullptr;
auto shmap = mapmet == 4 ? new SHMap(W_L, H_L) : nullptr;
float *buffer = new float[W_L * H_L];

2
rtengine/shmap.cc
View File

@@ -30,7 +30,7 @@ namespace rtengine
extern const Settings* settings;
SHMap::SHMap (int w, int h, bool multiThread) : max_f(0.f), min_f(0.f), avg(0.f), W(w), H(h), multiThread(multiThread)
SHMap::SHMap (int w, int h) : max_f(0.f), min_f(0.f), avg(0.f), W(w), H(h)
{
map = new float*[H];

3
rtengine/shmap.h
View File

@@ -34,7 +34,7 @@ public:
float** map;
float max_f, min_f, avg;
SHMap (int w, int h, bool multiThread);
SHMap (int w, int h);
~SHMap ();
void updateLab (LabImage* img, double radius, bool hq, int skip);
@@ -44,7 +44,6 @@ public:
private:
int W, H;
bool multiThread;
void fillLuminanceLab( LabImage * img, float **luminance);
void fillLuminance( Imagefloat * img, float **luminance, double lumi[3] );