summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2017-10-18 12:58:05 +0200
committerSlávek Banko <slavek.banko@axis.cz>2017-10-18 12:58:14 +0200
commitbdc6f0395d9fdd693d3e2abe8c8977f8deb68d25 (patch)
tree07d028c2e1995358063c847546f8bec59e99d3f7
parent3f20e6f371a04b44c8df2e1807875bff289b9843 (diff)
downloaddigikam-bdc6f0395d9fdd693d3e2abe8c8977f8deb68d25.tar.gz
digikam-bdc6f0395d9fdd693d3e2abe8c8977f8deb68d25.zip
Fix FTBFS with GCC7 on arm
Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit e04cc13c3ddf004bd10493b2520ef8309c868217)
-rw-r--r--digikam/imageplugins/coreplugin/sharpnesseditor/matrix.cpp8
-rw-r--r--digikam/libs/lprof/cmsreg.cpp2
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);