From 2283e6946a591e93f81df6678a0953baad1b9835 Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Sat, 4 Feb 2017 10:42:10 +0100 Subject: [PATCH] Matrix inversion: Ensure that null check is done against the same type --- matrix/SquareMatrix.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/matrix/SquareMatrix.hpp b/matrix/SquareMatrix.hpp index ddb059840d..32fb43ca9b 100644 --- a/matrix/SquareMatrix.hpp +++ b/matrix/SquareMatrix.hpp @@ -142,12 +142,12 @@ bool inv(const SquareMatrix & A, SquareMatrix & inv) for (size_t n = 0; n < M; n++) { // if diagonal is zero, swap with row below - if (fabsf(U(n, n)) < 1e-8f) { + if (fabsf(static_cast(U(n, n))) < 1e-8f) { //printf("trying pivot for row %d\n",n); for (size_t i = n + 1; i < M; i++) { //printf("\ttrying row %d\n",i); - if (fabsf(U(i, n)) > 1e-8f) { + if (fabsf(static_cast(U(i, n))) > 1e-8f) { //printf("swapped %d\n",i); U.swapRows(i, n); P.swapRows(i, n); @@ -167,7 +167,7 @@ bool inv(const SquareMatrix & A, SquareMatrix & inv) #endif // failsafe, return zero matrix - if (fabsf(U(n, n)) < 1e-8f) { + if (fabsf(static_cast(U(n, n))) < 1e-8f) { return false; }