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 s passed

Browse Source
This commit is contained in:
wmayer
2022-02-03 07:53:38 +01:00
parent 994071c43b
commit 7ff62348df
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/App/ColorModel.cpp
View File

@@ -106,12 +106,15 @@ ColorField& ColorField::operator = (const ColorField &rclCF)
void ColorField::set (const ColorModel &rclModel, float fMin, float fMax, std::size_t usCt)
{
colorModel = rclModel;
this->fMin = std::min<float>(fMin, fMax);
this->fMax = std::max<float>(fMin, fMax);
if (this->fMax <= this->fMin) {
fMin = std::min<float>(fMin, fMax);
fMax = std::max<float>(fMin, fMax);
if (fMax <= fMin) {
throw Base::ValueError("Maximum must be higher than minimum");
}
this->fMin = fMin;
this->fMax = fMax;
colorModel = rclModel;
ctColors = std::max<std::size_t>(usCt, colorModel.getCountColors());
rebuild();
}
@@ -209,11 +212,14 @@ 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) {
fMin = std::min<float>(fMin, fMax);
fMax = std::max<float>(fMin, fMax);
if (fMax <= fMin) {
throw Base::ValueError("Maximum must be higher than minimum");
}
_fMin = fMin;
_fMax = fMax;
ctColors = std::max<std::size_t>(usCt, getMinColors());
tStyle = tS;
outsideGrayed = bOG;