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

Merge branch 'lenscorrectiongui' into dev

Browse Source
This commit is contained in:
heckflosse
2017-09-16 19:18:04 +02:00
parent 14378f39af 9f75b197ea
commit 597c4fbaa1
12 changed files with 122 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rtengine/rtlensfun.cc
View File

@@ -437,7 +437,7 @@ std::unique_ptr<LFModifier> LFDatabase::findModifier(const LensProfParams &lensP
const LFDatabase *db = getInstance();
Glib::ustring make, model, lens;
float focallen = idata->getFocalLen();
if (lensProf.lfAutoMatch) {
if (lensProf.lfAutoMatch()) {
if (focallen <= 0) {
return nullptr;
}
@@ -450,7 +450,7 @@ std::unique_ptr<LFModifier> LFDatabase::findModifier(const LensProfParams &lensP
lens = lensProf.lfLens;
}
LFCamera c = db->findCamera(make, model);
LFLens l = db->findLens(lensProf.lfAutoMatch ? c : LFCamera(), lens);
LFLens l = db->findLens(lensProf.lfAutoMatch() ? c : LFCamera(), lens);
if (focallen <= 0 && l.data_ && l.data_->MinFocal == l.data_->MaxFocal) {
focallen = l.data_->MinFocal;
}