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

merge with lcp-vignetting-issue4062

Browse Source
This commit is contained in:
Alberto Griggio
2017-09-11 17:22:01 +02:00
parent 2611adf4e4 d442f7a85b
commit 4dc0e20ae0
9 changed files with 1019 additions and 788 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rtengine/iptransform.cc
View File

@@ -324,7 +324,7 @@ void ImProcFunctions::transform (Imagefloat* original, Imagefloat* transformed,
if (needsLensfun()) {
pLCPMap = LFDatabase::findModifier(params->lensProf, metadata, oW, oH, params->coarse, rawRotationDeg);
} else if (needsLCP()) { // don't check focal length to allow distortion correction for lenses without chip
LCPProfile *pLCPProf = lcpStore->getProfile (params->lensProf.lcpFile);
const std::shared_ptr<LCPProfile> pLCPProf = LCPStore::getInstance()->getProfile (params->lensProf.lcpFile);
if (pLCPProf) {
pLCPMap = new LCPMapper (pLCPProf, focalLen, focalLen35mm,
@@ -806,7 +806,7 @@ void ImProcFunctions::transformGeneral(ImProcFunctions::TransformMode mode, Imag
switch (mode) {
case ImProcFunctions::TRANSFORM_HIGH_QUALITY_FULLIMAGE:
enableLCPCA = pLCPMap && params->lensProf.useCA && pLCPMap->supportsCA();
enableLCPCA = pLCPMap && params->lensProf.useCA && pLCPMap->isCACorrectionAvailable();
// no break on purpose
case ImProcFunctions::TRANSFORM_HIGH_QUALITY:
enableLCPDist = pLCPMap && params->lensProf.useDist;