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

Do not search lensfun modifier if make, model or lens is empty, #4985

Browse Source
This commit is contained in:
heckflosse
2018-11-15 17:16:55 +01:00
parent 220714e376
commit 6074fe3be4
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rtengine/rtlensfun.cc
View File

@@ -501,7 +501,6 @@ std::unique_ptr<LFModifier> LFDatabase::getModifier(const LFCamera &camera, cons
std::unique_ptr<LFModifier> LFDatabase::findModifier(const LensProfParams &lensProf, const FramesMetaData *idata, int width, int height, const CoarseTransformParams &coarse, int rawRotationDeg) std::unique_ptr<LFModifier> LFDatabase::findModifier(const LensProfParams &lensProf, const FramesMetaData *idata, int width, int height, const CoarseTransformParams &coarse, int rawRotationDeg)
{ {
const LFDatabase *db = getInstance();
Glib::ustring make, model, lens; Glib::ustring make, model, lens;
float focallen = idata->getFocalLen(); float focallen = idata->getFocalLen();
if (lensProf.lfAutoMatch()) { if (lensProf.lfAutoMatch()) {
@@ -516,6 +515,11 @@ std::unique_ptr<LFModifier> LFDatabase::findModifier(const LensProfParams &lensP
model = lensProf.lfCameraModel; model = lensProf.lfCameraModel;
lens = lensProf.lfLens; lens = lensProf.lfLens;
} }
if (make.empty() || model.empty() || lens.empty()) {
return nullptr;
}
const LFDatabase *db = getInstance();
LFCamera c = db->findCamera(make, model); 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) { if (focallen <= 0 && l.data_ && l.data_->MinFocal == l.data_->MaxFocal) {