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

Merge branch 'dev' into metadata-exiv2

Browse Source
This commit is contained in:
Lawrence Lee
2023-02-15 22:28:18 -08:00
parent 8704c1dd86 8047aded3b
commit e3c7fd42e9
175 changed files with 3634 additions and 703 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rtengine/simpleprocess.cc
View File

@@ -262,7 +262,7 @@ private:
pl->setProgress(0.40);
}
imgsrc->HLRecovery_Global(params.toneCurve);
// imgsrc->HLRecovery_Global(params.toneCurve);
if (pl) {
@@ -373,7 +373,7 @@ private:
int beg_tileW = wcr * tileWskip + tileWskip / 2.f - crW / 2.f;
int beg_tileH = hcr * tileHskip + tileHskip / 2.f - crH / 2.f;
PreviewProps ppP(beg_tileW, beg_tileH, crW, crH, skipP);
imgsrc->getImage(currWB, tr, origCropPart, ppP, params.toneCurve, params.raw);
imgsrc->getImage(currWB, tr, origCropPart, ppP, params.toneCurve, params.raw, 0);
//baseImg->getStdImage(currWB, tr, origCropPart, ppP, true, params.toneCurve);
// we only need image reduced to 1/4 here
@@ -597,7 +597,7 @@ private:
for (int wcr = 0; wcr <= 2; wcr++) {
for (int hcr = 0; hcr <= 2; hcr++) {
PreviewProps ppP(coordW[wcr], coordH[hcr], crW, crH, 1);
imgsrc->getImage(currWB, tr, origCropPart, ppP, params.toneCurve, params.raw);
imgsrc->getImage(currWB, tr, origCropPart, ppP, params.toneCurve, params.raw, 0);
//baseImg->getStdImage(currWB, tr, origCropPart, ppP, true, params.toneCurve);
@@ -757,7 +757,7 @@ private:
}
baseImg = new Imagefloat(fw, fh);
imgsrc->getImage(currWB, tr, baseImg, pp, params.toneCurve, params.raw);
imgsrc->getImage(currWB, tr, baseImg, pp, params.toneCurve, params.raw, 1);
if (pl) {
pl->setProgress(0.50);