File digikam-trinity-gcc6.patch of Package kde3-digikam

From 81067ed9e3671351350f13c359be87dd12ceef11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Sat, 3 Sep 2016 17:52:24 +0200
Subject: Fix FTBFS with GCC6
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>
---
 digikam/libs/greycstoration/greycstoration.h |  2 +-
 digikam/libs/lprof/cmslnr.cpp                | 14 +++++++-------
 digikam/tdeioslave/digikamdates.cpp          |  2 +-
 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/kioslave/digikamdates.cpp
+++ b/digikam/kioslave/digikamdates.cpp
@@ -199,7 +199,7 @@ void kio_digikamdates::special(const QByteArray& data)
                          .arg(moEndStr, 2)
                          .arg(yrStart, 4)
                          .arg(moStartStr, 2),
-                         &values, false);
+                         &values, 0, false);
 
             Q_LLONG     imageid;
             QString     name;
-- 
cgit v1.1