From 658087e270f11192f51d1c21b7e01ef9298052f3 Mon Sep 17 00:00:00 2001 From: heckflosse Date: Sun, 17 Sep 2017 15:53:57 +0200 Subject: [PATCH] Lensfun: Reading pp3 with applied LCP doesn't set the LCP radio button. Fixes #4088 --- rtengine/procparams.cc | 6 +++--- rtengine/procparams.h | 32 ++++++++++++++++---------------- rtgui/lensprofile.cc | 16 ++++++++-------- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/rtengine/procparams.cc b/rtengine/procparams.cc index 886e99c08..7a3fec1ea 100644 --- a/rtengine/procparams.cc +++ b/rtengine/procparams.cc @@ -52,7 +52,7 @@ const int br = (int) options.rtSettings.bot_right; const int tl = (int) options.rtSettings.top_left; const int bl = (int) options.rtSettings.bot_left; -const char *LensProfParams::methodstring[static_cast(LensProfParams::eLcMode::LC_LCP) + 1u] = {"none", "lfauto", "lfmanual", "lcp"}; +const char *LensProfParams::methodstring[static_cast(LensProfParams::LcMode::LCP) + 1u] = {"none", "lfauto", "lfmanual", "lcp"}; const char *RAWParams::BayerSensor::methodstring[RAWParams::BayerSensor::numMethods] = {"amaze", "igv", "lmmse", "eahd", "hphd", "vng4", "dcb", "ahd", "fast", "mono", "none", "pixelshift" }; const char *RAWParams::XTransSensor::methodstring[RAWParams::XTransSensor::numMethods] = {"3-pass (best)", "1-pass (medium)", "fast", "mono", "none" }; @@ -920,7 +920,7 @@ void ToneCurveParams::setDefaults() void LensProfParams::setDefaults() { - lcMode = eLcMode::LC_NOCORRECTION; + lcMode = LcMode::NONE; lcpFile = ""; useDist = useVign = true; useCA = false; @@ -5836,7 +5836,7 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited) } if(ppVersion < 327 && !lensProf.lcpFile.empty()) { - lensProf.lcMode = LensProfParams::eLcMode::LC_LCP; + lensProf.lcMode = LensProfParams::LcMode::LCP; } } diff --git a/rtengine/procparams.h b/rtengine/procparams.h index 8c7cb6a1d..aaf62c53f 100644 --- a/rtengine/procparams.h +++ b/rtengine/procparams.h @@ -829,15 +829,15 @@ class LensProfParams { public: - enum class eLcMode { - LC_NOCORRECTION, // No lens correction - LC_LENSFUNAUTOMATCH, // Lens correction using auto matched lensfun database entry - LC_LENSFUNMANUAL, // Lens correction using manually selected lensfun database entry - LC_LCP // Lens correction using lcp file + enum class LcMode { + NONE, // No lens correction + LENSFUNAUTOMATCH, // Lens correction using auto matched lensfun database entry + LENSFUNMANUAL, // Lens correction using manually selected lensfun database entry + LCP // Lens correction using lcp file }; - static const char *methodstring[static_cast(eLcMode::LC_LCP) + 1u]; - eLcMode lcMode; + static const char *methodstring[static_cast(LcMode::LCP) + 1u]; + LcMode lcMode; Glib::ustring lcpFile; bool useDist, useVign, useCA; Glib::ustring lfCameraMake; @@ -852,37 +852,37 @@ public: bool useLensfun() const { - return lcMode == eLcMode::LC_LENSFUNAUTOMATCH || lcMode == eLcMode::LC_LENSFUNMANUAL; + return lcMode == LcMode::LENSFUNAUTOMATCH || lcMode == LcMode::LENSFUNMANUAL; } bool lfAutoMatch() const { - return lcMode == eLcMode::LC_LENSFUNAUTOMATCH; + return lcMode == LcMode::LENSFUNAUTOMATCH; } bool useLcp() const { - return lcMode == eLcMode::LC_LCP && lcpFile.length() > 0; + return lcMode == LcMode::LCP && lcpFile.length() > 0; } bool lfManual() const { - return lcMode == eLcMode::LC_LENSFUNMANUAL; + return lcMode == LcMode::LENSFUNMANUAL; } - Glib::ustring getMethodString(eLcMode mode) const + Glib::ustring getMethodString(LcMode mode) const { return methodstring[static_cast(mode)]; } - eLcMode getMethodNumber(const Glib::ustring &mode) const + LcMode getMethodNumber(const Glib::ustring &mode) const { - for(size_t i = 0; i < static_cast(eLcMode::LC_LCP); ++i) { + for(size_t i = 0; i <= static_cast(LcMode::LCP); ++i) { if(methodstring[i] == mode) { - return static_cast(i); + return static_cast(i); } } - return eLcMode::LC_NOCORRECTION; + return LcMode::NONE; } }; diff --git a/rtgui/lensprofile.cc b/rtgui/lensprofile.cc index 7ce62b0a5..f95e27321 100644 --- a/rtgui/lensprofile.cc +++ b/rtgui/lensprofile.cc @@ -161,16 +161,16 @@ void LensProfilePanel::read(const rtengine::procparams::ProcParams* pp, const Pa corrLensfunAuto->set_sensitive(true); switch(pp->lensProf.lcMode) { - case procparams::LensProfParams::eLcMode::LC_LCP : + case procparams::LensProfParams::LcMode::LCP : corrLcpFile->set_active(true); break; - case procparams::LensProfParams::eLcMode::LC_LENSFUNAUTOMATCH : + case procparams::LensProfParams::LcMode::LENSFUNAUTOMATCH : corrLensfunAuto->set_active(true); break; - case procparams::LensProfParams::eLcMode::LC_LENSFUNMANUAL : + case procparams::LensProfParams::LcMode::LENSFUNMANUAL : corrLensfunManual->set_active(true); break; - case procparams::LensProfParams::eLcMode::LC_NOCORRECTION : + case procparams::LensProfParams::LcMode::NONE : corrOff->set_active(true); } @@ -274,13 +274,13 @@ void LensProfilePanel::setRawMeta(bool raw, const rtengine::ImageMetaData* pMeta void LensProfilePanel::write( rtengine::procparams::ProcParams* pp, ParamsEdited* pedited) { if (corrLcpFile->get_active()) { - pp->lensProf.lcMode = procparams::LensProfParams::eLcMode::LC_LCP; + pp->lensProf.lcMode = procparams::LensProfParams::LcMode::LCP; } else if(corrLensfunManual->get_active()) { - pp->lensProf.lcMode = procparams::LensProfParams::eLcMode::LC_LENSFUNMANUAL; + pp->lensProf.lcMode = procparams::LensProfParams::LcMode::LENSFUNMANUAL; } else if(corrLensfunAuto->get_active()) { - pp->lensProf.lcMode = procparams::LensProfParams::eLcMode::LC_LENSFUNAUTOMATCH; + pp->lensProf.lcMode = procparams::LensProfParams::LcMode::LENSFUNAUTOMATCH; } else if(corrOff->get_active()) { - pp->lensProf.lcMode = procparams::LensProfParams::eLcMode::LC_NOCORRECTION; + pp->lensProf.lcMode = procparams::LensProfParams::LcMode::NONE; } if (LCPStore::getInstance()->isValidLCPFileName(fcbLCPFile->get_filename())) {