diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2022-10-09 07:34:09 +0300 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2022-10-10 17:04:12 +0300 |
| commit | 603a4d60f6ac4dbc2474700943dd1a0066ee1f23 (patch) | |
| tree | bfa78f93fbb2981e7d6787ae2e9571481673c3f9 /src/ipa/rkisp1/algorithms/gsl.cpp | |
| parent | 4bf68fdbe1493e57118dad4e94c2a46c50a9c402 (diff) | |
ipa: rkisp1: Drop use of utils::defopt
utils::defopt causes compilation issues on gcc 8.0.0 to gcc 8.3.0,
likely due to bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=86521
that was fixed in gcc 8.4.0. gcc 8.3.0 may be considered old (libcamera
requires gcc-8 or newer), but it is shipped by Debian 10 that has LTS
support until mid-2024.
As no workaround has been found to fix compilation on gcc 8.3.0 while
still retaining the functionality of utils::defopt, stop using it in the
RkISP1 IPA module.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Diffstat (limited to 'src/ipa/rkisp1/algorithms/gsl.cpp')
| -rw-r--r-- | src/ipa/rkisp1/algorithms/gsl.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ipa/rkisp1/algorithms/gsl.cpp b/src/ipa/rkisp1/algorithms/gsl.cpp index a80fed58..b9f87912 100644 --- a/src/ipa/rkisp1/algorithms/gsl.cpp +++ b/src/ipa/rkisp1/algorithms/gsl.cpp @@ -59,7 +59,7 @@ int GammaSensorLinearization::init([[maybe_unused]] IPAContext &context, const YamlObject &tuningData) { std::vector<uint16_t> xIntervals = - tuningData["x-intervals"].getList<uint16_t>().value_or(utils::defopt); + tuningData["x-intervals"].getList<uint16_t>().value_or(std::vector<uint16_t>{}); if (xIntervals.size() != kDegammaXIntervals) { LOG(RkISP1Gsl, Error) << "Invalid 'x' coordinates: expected " @@ -83,7 +83,7 @@ int GammaSensorLinearization::init([[maybe_unused]] IPAContext &context, return -EINVAL; } - curveYr_ = yObject["red"].getList<uint16_t>().value_or(utils::defopt); + curveYr_ = yObject["red"].getList<uint16_t>().value_or(std::vector<uint16_t>{}); if (curveYr_.size() != RKISP1_CIF_ISP_DEGAMMA_CURVE_SIZE) { LOG(RkISP1Gsl, Error) << "Invalid 'y:red' coordinates: expected " @@ -92,7 +92,7 @@ int GammaSensorLinearization::init([[maybe_unused]] IPAContext &context, return -EINVAL; } - curveYg_ = yObject["green"].getList<uint16_t>().value_or(utils::defopt); + curveYg_ = yObject["green"].getList<uint16_t>().value_or(std::vector<uint16_t>{}); if (curveYg_.size() != RKISP1_CIF_ISP_DEGAMMA_CURVE_SIZE) { LOG(RkISP1Gsl, Error) << "Invalid 'y:green' coordinates: expected " @@ -101,7 +101,7 @@ int GammaSensorLinearization::init([[maybe_unused]] IPAContext &context, return -EINVAL; } - curveYb_ = yObject["blue"].getList<uint16_t>().value_or(utils::defopt); + curveYb_ = yObject["blue"].getList<uint16_t>().value_or(std::vector<uint16_t>{}); if (curveYb_.size() != RKISP1_CIF_ISP_DEGAMMA_CURVE_SIZE) { LOG(RkISP1Gsl, Error) << "Invalid 'y:blue' coordinates: expected " |