From bdc6f0395d9fdd693d3e2abe8c8977f8deb68d25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Wed, 18 Oct 2017 12:58:05 +0200
Subject: [PATCH] Fix FTBFS with GCC7 on arm
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit e04cc13c3ddf004bd10493b2520ef8309c868217)
---
 .../imageplugins/coreplugin/sharpnesseditor/matrix.cpp    | 8 ++++----
 digikam/libs/lprof/cmsreg.cpp                             | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/matrix.cpp b/digikam/imageplugins/coreplugin/sharpnesseditor/matrix.cpp
index 88ef607..10a12b7 100644
--- a/digikam/imageplugins/coreplugin/sharpnesseditor/matrix.cpp
+++ b/digikam/imageplugins/coreplugin/sharpnesseditor/matrix.cpp
@@ -30,16 +30,16 @@
 // Square 
 #define SQR(x) ((x) * (x))
 
+// C++ includes.
+
+#include <cmath>
+
 extern "C"
 {
 #include "f2c.h"
 #include "clapack.h"
 }
 
-// C++ includes.
-
-#include <cmath>
-
 // TQt includes.
 
 #include <tqglobal.h>
diff --git a/digikam/libs/lprof/cmsreg.cpp b/digikam/libs/lprof/cmsreg.cpp
index 00c6c06..4e66a9e 100644
--- a/digikam/libs/lprof/cmsreg.cpp
+++ b/digikam/libs/lprof/cmsreg.cpp
@@ -147,7 +147,7 @@ BOOL MultipleLinearRegression(const LPMATN xi,                /* Dependent varia
 
     /* |bt| = |b| T */
     bt = MATNtranspose (b);
-    if (bt == false) return false;
+    if (bt == NULL) return false;
 
     /*  |yt| = |bt| * |xt| */
     yt = MATNmult (bt, xt);