From 339c7943598775371efd7d17eb538635c30047db Mon Sep 17 00:00:00 2001 From: Alberto Griggio Date: Thu, 16 Nov 2017 21:22:17 +0100 Subject: [PATCH] Fixed bug (typo) in LCP-based CA correction (now reenabled) --- rtengine/lcp.cc | 4 ++-- rtgui/lensprofile.cc | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/rtengine/lcp.cc b/rtengine/lcp.cc index cd338258f..834fc65c3 100644 --- a/rtengine/lcp.cc +++ b/rtengine/lcp.cc @@ -1023,7 +1023,7 @@ rtengine::LCPMapper::LCPMapper( bool rtengine::LCPMapper::isCACorrectionAvailable() const { - return false /*enableCA*/; // agriggio TODO -- this is currently broken + return enableCA; } void rtengine::LCPMapper::correctDistortion(double &x, double &y, int cx, int cy, double scale) const @@ -1128,7 +1128,7 @@ void rtengine::LCPMapper::correctCA(double& x, double& y, int cx, int cy, int ch } x -= cx; - x -= cy; + y -= cy; } SSEFUNCTION void rtengine::LCPMapper::processVignetteLine(int width, int y, float* line) const diff --git a/rtgui/lensprofile.cc b/rtgui/lensprofile.cc index b9ec44d7c..f5c9a11ab 100644 --- a/rtgui/lensprofile.cc +++ b/rtgui/lensprofile.cc @@ -380,8 +380,7 @@ void LensProfilePanel::updateDisabled(bool enable) { ckbUseDist->set_sensitive(enable); ckbUseVign->set_sensitive(enable && isRaw); - // agriggio TODO -- CA correction via LCP is currently broken - ckbUseCA->set_sensitive(false);//enable && allowFocusDep); + ckbUseCA->set_sensitive(enable && allowFocusDep); } void LensProfilePanel::setBatchMode(bool yes)