Profiled lens correction: Do not call lensfun search with empty strings

This commit is contained in:
Ingo Weyrich 2020-10-13 13:27:20 +02:00
parent 414e0f8197
commit a30dca0b0e

View File

@ -438,7 +438,7 @@ std::vector<LFLens> LFDatabase::getLenses() const
LFCamera LFDatabase::findCamera(const Glib::ustring &make, const Glib::ustring &model) const LFCamera LFDatabase::findCamera(const Glib::ustring &make, const Glib::ustring &model) const
{ {
LFCamera ret; LFCamera ret;
if (data_) { if (data_ && !make.empty()) {
MyMutex::MyLock lock(lfDBMutex); MyMutex::MyLock lock(lfDBMutex);
auto found = data_->FindCamerasExt(make.c_str(), model.c_str()); auto found = data_->FindCamerasExt(make.c_str(), model.c_str());
if (found) { if (found) {
@ -453,7 +453,7 @@ LFCamera LFDatabase::findCamera(const Glib::ustring &make, const Glib::ustring &
LFLens LFDatabase::findLens(const LFCamera &camera, const Glib::ustring &name) const LFLens LFDatabase::findLens(const LFCamera &camera, const Glib::ustring &name) const
{ {
LFLens ret; LFLens ret;
if (data_) { if (data_ && !name.empty()) {
MyMutex::MyLock lock(lfDBMutex); MyMutex::MyLock lock(lfDBMutex);
auto found = data_->FindLenses(camera.data_, nullptr, name.c_str()); auto found = data_->FindLenses(camera.data_, nullptr, name.c_str());
for (size_t pos = 0; !found && pos < name.size(); ) { for (size_t pos = 0; !found && pos < name.size(); ) {