kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

App: fix ColorField::set/ColorGradient::set in case an invalid value range is passed

Browse Source
This commit is contained in:
wmayer
2022-02-05 14:13:35 +01:00
parent 76f17e2935
commit ce8df41709
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/App/ColorModel.cpp
View File

@@ -106,14 +106,13 @@ ColorField& ColorField::operator = (const ColorField &rclCF)
void ColorField::set (const ColorModel &rclModel, float fMin, float fMax, std::size_t usCt)
{
fMin = std::min<float>(fMin, fMax);
fMax = std::max<float>(fMin, fMax);
if (fMax <= fMin) {
auto bounds = std::minmax(fMin, fMax);
if (bounds.first <= bounds.second) {
throw Base::ValueError("Maximum must be higher than minimum");
}
this->fMin = fMin;
this->fMax = fMax;
this->fMin = bounds.first;
this->fMax = bounds.second;
colorModel = rclModel;
ctColors = std::max<std::size_t>(usCt, colorModel.getCountColors());
rebuild();
@@ -212,14 +211,13 @@ std::vector<std::string> ColorGradient::getColorModelNames() const
void ColorGradient::set (float fMin, float fMax, std::size_t usCt, TStyle tS, bool bOG)
{
fMin = std::min<float>(fMin, fMax);
fMax = std::max<float>(fMin, fMax);
if (fMax <= fMin) {
auto bounds = std::minmax(fMin, fMax);
if (bounds.first <= bounds.second) {
throw Base::ValueError("Maximum must be higher than minimum");
}
_fMin = fMin;
_fMax = fMax;
_fMin = bounds.first;
_fMax = bounds.second;
ctColors = std::max<std::size_t>(usCt, getMinColors());
tStyle = tS;
outsideGrayed = bOG;