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

merge with dev - I hope no error

Browse Source
This commit is contained in:
Desmis
2017-02-21 18:02:48 +01:00
parent f9b592dfd5 ac882d2ff2
commit 1f7ad78e25
74 changed files with 886 additions and 695 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
rtengine/improcfun.cc
View File

@@ -150,8 +150,8 @@ void ImProcFunctions::firstAnalysis (const Imagefloat* const original, const Pro
lumimul[0] = wprof[1][0];
lumimul[1] = wprof[1][1];
lumimul[2] = wprof[1][2];
int W = original->width;
int H = original->height;
int W = original->getWidth();
int H = original->getHeight();
float lumimulf[3] = {static_cast<float>(lumimul[0]), static_cast<float>(lumimul[1]), static_cast<float>(lumimul[2])};
@@ -2888,8 +2888,8 @@ void ImProcFunctions::moyeqt (Imagefloat* working, float &moyS, float &eqty)
{
BENCHFUN
int tHh = working->height;
int tWw = working->width;
int tHh = working->getHeight();
int tWw = working->getWidth();
double moy = 0.0;
double sqrs = 0.0;
@@ -3284,11 +3284,11 @@ void ImProcFunctions::rgbProc (Imagefloat* working, LabImage* lab, PipetteBuffer
bool hasgammabw = gammabwr != 1.f || gammabwg != 1.f || gammabwb != 1.f;
if (hasColorToning || blackwhite || (params->dirpyrequalizer.cbdlMethod == "bef" && params->dirpyrequalizer.enabled)) {
tmpImage = new Imagefloat(working->width, working->height);
tmpImage = new Imagefloat(working->getWidth(), working->getHeight());
}
int W = working->width;
int H = working->height;
int W = working->getWidth();
int H = working->getHeight();
// For tonecurve histogram
int toneCurveHistSize = histToneCurve ? histToneCurve.getSize() : 0;
@@ -3354,12 +3354,12 @@ void ImProcFunctions::rgbProc (Imagefloat* working, LabImage* lab, PipetteBuffer
#pragma omp for schedule(dynamic) collapse(2)
#endif
for(int ii = 0; ii < working->height; ii += TS)
for(int jj = 0; jj < working->width; jj += TS) {
for(int ii = 0; ii < working->getHeight(); ii += TS)
for(int jj = 0; jj < working->getWidth(); jj += TS) {
istart = ii;
jstart = jj;
tH = min(ii + TS, working->height);
tW = min(jj + TS, working->width);
tH = min(ii + TS, working->getHeight());
tW = min(jj + TS, working->getWidth());
for (int i = istart, ti = 0; i < tH; i++, ti++) {
@@ -4452,8 +4452,8 @@ void ImProcFunctions::rgbProc (Imagefloat* working, LabImage* lab, PipetteBuffer
// starting a new tile processing with a 'reduction' clause for the auto mixer computing
if (blackwhite) {//channel-mixer
int tW = working->width;
int tH = working->height;
int tW = working->getWidth();
int tH = working->getHeight();
if (algm == 2) { //channel-mixer
//end auto chmix