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
2018-02-15 16:57:23 +01:00
parent 96c49a3086 20fcffae94
commit 9916cdb4b0
61 changed files with 201 additions and 4414 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rtengine/dcrop.cc
View File

@@ -444,7 +444,7 @@ void Crop::update(int todo)
Imagefloat *origCropPart = new Imagefloat(crW, crH); //allocate memory
Imagefloat *provicalc = new Imagefloat((crW + 1) / 2, (crH + 1) / 2); //for denoise curves
int coordW[3];//coordonate of part of image to mesure noise
int coordW[3];//coordinate of part of image to measure noise
int coordH[3];
int begW = 50;
int begH = 50;
@@ -517,7 +517,7 @@ void Crop::update(int todo)
float multip = 1.f;
if (!parent->imgsrc->isRAW()) {
multip = 2.f; //take into account gamma for TIF / JPG approximate value...not good fot gamma=1
multip = 2.f; //take into account gamma for TIF / JPG approximate value...not good for gamma=1
}
float adjustr = 1.f;
@@ -1970,7 +1970,7 @@ void Crop::update(int todo)
dummy, dummy, parent->CAMBrightCurveJ, parent->CAMBrightCurveQ, parent->CAMMean, 5, skip, execsharp, dd, dj, 1);
}
} else {
// CIECAM is disbaled, we free up its image buffer to save some space
// CIECAM is disabled, we free up its image buffer to save some space
if (cieCrop) {
delete cieCrop;
}