From e9c2d579eed29daaa9f10336d3caed0c988dc9b7 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sat, 24 Oct 2015 11:20:49 +0200 Subject: qfc: guard against unlikely division by zero --- qfunctionconfigurator/functionconfig.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qfunctionconfigurator/functionconfig.cpp') diff --git a/qfunctionconfigurator/functionconfig.cpp b/qfunctionconfigurator/functionconfig.cpp index cac8121c..e319b61e 100644 --- a/qfunctionconfigurator/functionconfig.cpp +++ b/qfunctionconfigurator/functionconfig.cpp @@ -104,7 +104,7 @@ void Map::reload() { for (int i = 0; i < sz; i++) data[i] = -1; - if (input.size() == 1) + if (input.size() == 1 && input[0].x() > 1e-2) { for (int k = 0; k < input[0].x() * mult; k++) { if (k < sz) -- cgit v1.2.3 From a176bc811bf906b8c6816d0444eac979facf688c Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sun, 25 Oct 2015 16:18:45 +0100 Subject: qfc: drop nan check Bug cause was different --- qfunctionconfigurator/functionconfig.cpp | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'qfunctionconfigurator/functionconfig.cpp') diff --git a/qfunctionconfigurator/functionconfig.cpp b/qfunctionconfigurator/functionconfig.cpp index e319b61e..27f3bf40 100644 --- a/qfunctionconfigurator/functionconfig.cpp +++ b/qfunctionconfigurator/functionconfig.cpp @@ -75,18 +75,6 @@ static bool sortFn(const QPointF& one, const QPointF& two) { return one.x() < two.x(); } -static inline bool nanp(double value) -{ - return std::isnan(value) || std::isinf(value); -} - -static inline double elide_nan(double value) -{ - if (nanp(value)) - return -1; - return value; -} - void Map::reload() { if (cur.input.size()) { @@ -144,7 +132,7 @@ void Map::reload() { (-p0_y + 3. * p1_y - 3. * p2_y + p3_y) * t3); if (x >= 0 && x < sz) - data[x] = elide_nan(y); + data[x] = y; } } -- cgit v1.2.3