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

Merge branch 'dev' into ph1speedup

Browse Source
This commit is contained in:
heckflosse
2017-10-29 14:35:28 +01:00
parent 643f25a8cc 1c86c3c44d
commit da5664599e
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rtengine/iptransform.cc
View File

@@ -796,9 +796,6 @@ void ImProcFunctions::transformGeneral(ImProcFunctions::TransformMode mode, Imag
case ImProcFunctions::TRANSFORM_HIGH_QUALITY: { case ImProcFunctions::TRANSFORM_HIGH_QUALITY: {
enableLCPDist = pLCPMap && params->lensProf.useDist; enableLCPDist = pLCPMap && params->lensProf.useDist;
if (enableLCPCA) {
enableLCPDist = false;
}
enableCA = enableLCPCA || needsCA(); enableCA = enableLCPCA || needsCA();
} }
//no break on purpose //no break on purpose
@@ -810,6 +807,10 @@ void ImProcFunctions::transformGeneral(ImProcFunctions::TransformMode mode, Imag
} }
} }
if (enableLCPCA) {
enableLCPDist = false;
}
if (!enableCA) { if (!enableCA) {
chDist[0] = 0.0; chDist[0] = 0.0;
} }

3
rtengine/simpleprocess.cc
View File

@@ -817,7 +817,8 @@ private:
trImg = baseImg; trImg = baseImg;
} else { } else {
trImg = new Imagefloat (fw, fh); trImg = new Imagefloat (fw, fh);
} ipf.transform (baseImg, trImg, 0, 0, 0, 0, fw, fh, fw, fh, }
ipf.transform (baseImg, trImg, 0, 0, 0, 0, fw, fh, fw, fh,
imgsrc->getMetaData(), imgsrc->getRotateDegree(), true); imgsrc->getMetaData(), imgsrc->getRotateDegree(), true);
if(trImg != baseImg) { if(trImg != baseImg) {
delete baseImg; delete baseImg;