summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2016-09-03 17:52:24 +0200
committerSlávek Banko <slavek.banko@axis.cz>2016-09-03 17:52:24 +0200
commit81067ed9e3671351350f13c359be87dd12ceef11 (patch)
treec08c7fa845e5612e762324543ba7764171184abb
parent4cba3ad2e4534ef7bf7d0fe6c92717a6e9c8c03d (diff)
downloaddigikam-81067ed9e3671351350f13c359be87dd12ceef11.tar.gz
digikam-81067ed9e3671351350f13c359be87dd12ceef11.zip
Fix FTBFS with GCC6
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--digikam/libs/greycstoration/greycstoration.h2
-rw-r--r--digikam/libs/lprof/cmslnr.cpp14
-rw-r--r--digikam/tdeioslave/digikamdates.cpp2
3 files changed, 9 insertions, 9 deletions
diff --git a/digikam/libs/greycstoration/greycstoration.h b/digikam/libs/greycstoration/greycstoration.h
index a80e2e0..36b2c0e 100644
--- a/digikam/libs/greycstoration/greycstoration.h
+++ b/digikam/libs/greycstoration/greycstoration.h
@@ -454,7 +454,7 @@ static void* greycstoration_thread(void *arg) {
p.temporary = 0;
p.counter = 0;
p.tile = p.tile_border = p.thread = p.nb_threads = 0;
- p.stop_request = false;
+ p.stop_request = 0;
greycstoration_mutex_destroy(p);
}
p.is_running = false;
diff --git a/digikam/libs/lprof/cmslnr.cpp b/digikam/libs/lprof/cmslnr.cpp
index f151f68..dddd8e3 100644
--- a/digikam/libs/lprof/cmslnr.cpp
+++ b/digikam/libs/lprof/cmslnr.cpp
@@ -238,7 +238,7 @@ BOOL OneTry(LPSAMPLEDCURVE XNorm, LPSAMPLEDCURVE YNorm, double a[])
LPGAMMATABLE cmsxEstimateGamma(LPSAMPLEDCURVE X, LPSAMPLEDCURVE Y, int nResultingPoints)
{
double a[5];
- LPSAMPLEDCURVE XNorm, YNorm;
+ LPSAMPLEDCURVE XNorm, YNorm;
double e, Max;
@@ -246,14 +246,14 @@ LPGAMMATABLE cmsxEstimateGamma(LPSAMPLEDCURVE X, LPSAMPLEDCURVE Y, int nResultin
/* We have only a portion of curve. It is likely */
/* maximum will not fall on exactly 100. */
- if (!OneTry(X, Y, a))
- return false;
+ if (!OneTry(X, Y, a))
+ return 0;
/* Got parameters. Compute maximum. */
e = a[1]* 255.0 + a[2];
- if (e < 0) return false;
+ if (e < 0) return 0;
Max = pow(e, a[0]);
-
+
/* Normalize values to maximum */
XNorm = NormalizeTo(X, 255.0, false);
@@ -261,8 +261,8 @@ LPGAMMATABLE cmsxEstimateGamma(LPSAMPLEDCURVE X, LPSAMPLEDCURVE Y, int nResultin
/* Do the final fitting */
if (!OneTry(XNorm, YNorm, a))
- return false;
-
+ return 0;
+
/* Type 3 = IEC 61966-2.1 (sRGB) */
/* Y = (aX + b)^Gamma | X >= d */
/* Y = cX | X < d */
diff --git a/digikam/tdeioslave/digikamdates.cpp b/digikam/tdeioslave/digikamdates.cpp
index 1e28c3a..a82e978 100644
--- a/digikam/tdeioslave/digikamdates.cpp
+++ b/digikam/tdeioslave/digikamdates.cpp
@@ -199,7 +199,7 @@ void tdeio_digikamdates::special(const TQByteArray& data)
.arg(moEndStr, 2)
.arg(yrStart, 4)
.arg(moStartStr, 2),
- &values, false);
+ &values, 0, false);
TQ_LLONG imageid;
TQString name;