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

Merge pull request #7407 from Lawrence37/lensfun-manually-selected-lens-fix

Browse Source 
Fix for profiled lens correction with manually selected lens
This commit is contained in:
Lawrence37 2025-05-27 17:51:16 -07:00 committed by GitHub
commit 39ac22a40b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
rtengine/rtlensfun.cc
View File

@ -30,16 +30,6 @@
namespace namespace
{ {
bool isCStringIn(const char *str, const char *const *list)
{
for (auto element_ptr = list; *element_ptr; element_ptr++) {
if (!strcmp(str, *element_ptr)) {
return true;
}
}
return false;
}
bool isNextLensCropFactorBetter(const lfLens *current_lens, const lfCamera *camera, float next_lens_crop_factor) bool isNextLensCropFactorBetter(const lfLens *current_lens, const lfCamera *camera, float next_lens_crop_factor)
{ {
if (!current_lens) { if (!current_lens) {
@ -75,8 +65,7 @@ bool isNextLensCropFactorBetter(const lfLens *current_lens, const lfCamera *came
bool isNextLensBetter(const lfCamera *camera, const lfLens *current_lens, const lfLens &next_lens, const Glib::ustring &lens_name, const Glib::ustring &next_lens_name) bool isNextLensBetter(const lfCamera *camera, const lfLens *current_lens, const lfLens &next_lens, const Glib::ustring &lens_name, const Glib::ustring &next_lens_name)
{ {
return isNextLensCropFactorBetter(current_lens, camera, next_lens.CropFactor) && return isNextLensCropFactorBetter(current_lens, camera, next_lens.CropFactor) &&
lens_name == next_lens_name && lens_name == next_lens_name;
(!camera || isCStringIn(camera->Mount, next_lens.Mounts));
} }
/** /**