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

improved logic for auto-matching lensfun correction (esp. with fixed-lens cameras)

Browse Source
This commit is contained in:
Alberto Griggio
2017-09-08 18:02:34 +02:00
parent 5a37c38bfb
commit b2232f3843
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rtengine/rtlensfun.cc
View File

@@ -250,7 +250,13 @@ LFLens LFDatabase::findLens(const LFCamera &camera, const Glib::ustring &name) c
{ {
LFLens ret; LFLens ret;
if (data_) { if (data_) {
auto found = data_->FindLenses(camera.data_, NULL, name.c_str(), LF_SEARCH_LOOSE); const char *lname = name.c_str();
const lfCamera *cam = nullptr;
if (name.empty() || name.find("Unknown ") == 0) {
lname = "Standard";
cam = camera.data_;
}
auto found = data_->FindLenses(cam, nullptr, lname, LF_SEARCH_LOOSE);
if (!found) { if (!found) {
// try to split the maker from the model of the lens // try to split the maker from the model of the lens
Glib::ustring make, model; Glib::ustring make, model;
@@ -258,7 +264,7 @@ LFLens LFDatabase::findLens(const LFCamera &camera, const Glib::ustring &name) c
if (i != Glib::ustring::npos) { if (i != Glib::ustring::npos) {
make = name.substr(0, i); make = name.substr(0, i);
model = name.substr(i+1); model = name.substr(i+1);
found = data_->FindLenses(camera.data_, make.c_str(), model.c_str(), LF_SEARCH_LOOSE); found = data_->FindLenses(cam, make.c_str(), model.c_str(), LF_SEARCH_LOOSE);
} }
} }
if (found) { if (found) {