From 99f41baf4f0d6ae8adb59b44b7efa8200d486c1d Mon Sep 17 00:00:00 2001 From: Alberto Griggio Date: Tue, 14 Nov 2017 22:52:57 +0100 Subject: [PATCH] disable LCP-based CA correction, as it is currently broken --- rtengine/lcp.cc | 2 +- rtgui/lensprofile.cc | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/rtengine/lcp.cc b/rtengine/lcp.cc index 44a470e17..cd338258f 100644 --- a/rtengine/lcp.cc +++ b/rtengine/lcp.cc @@ -1023,7 +1023,7 @@ rtengine::LCPMapper::LCPMapper( bool rtengine::LCPMapper::isCACorrectionAvailable() const { - return enableCA; + return false /*enableCA*/; // agriggio TODO -- this is currently broken } void rtengine::LCPMapper::correctDistortion(double &x, double &y, int cx, int cy, double scale) const diff --git a/rtgui/lensprofile.cc b/rtgui/lensprofile.cc index d158f44f4..d96d65cb6 100644 --- a/rtgui/lensprofile.cc +++ b/rtgui/lensprofile.cc @@ -192,7 +192,7 @@ void LensProfilePanel::read(const rtengine::procparams::ProcParams* pp, const Pa ckbUseDist->set_active (pp->lensProf.useDist); ckbUseVign->set_active (pp->lensProf.useVign && isRaw); - ckbUseCA->set_active (pp->lensProf.useCA && isRaw); + ckbUseCA->set_active(pp->lensProf.useCA && isRaw && ckbUseCA->get_sensitive()); const LFDatabase *db = LFDatabase::getInstance(); LFCamera c; @@ -380,7 +380,8 @@ void LensProfilePanel::updateDisabled(bool enable) { ckbUseDist->set_sensitive(enable); ckbUseVign->set_sensitive(enable && isRaw); - ckbUseCA->set_sensitive(enable && allowFocusDep); + // agriggio TODO -- CA correction via LCP is currently broken + ckbUseCA->set_sensitive(false);//enable && allowFocusDep); } void LensProfilePanel::setBatchMode(bool yes)