From 69b2efbaa60184578c64dfe86b4bd1316c6ed6fa Mon Sep 17 00:00:00 2001
From: Björn Esser <besser82@fedoraproject.org>
Date: Jan 03 2018 09:33:56 +0000
Subject: Update to recent snapshot


---

diff --git a/.gitignore b/.gitignore
index 9823b15..0629cd5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /CTK-bdc8caca0458759e1672a94ca2857595d40f17b0.tar.gz
+/CTK-71799c27da506c899f2ef04b50cd8d454374870d.tar.gz
diff --git a/ctk-qreal_not_double.patch b/ctk-qreal_not_double.patch
deleted file mode 100644
index e4fba82..0000000
--- a/ctk-qreal_not_double.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Index: CTK-bdc8caca0458759e1672a94ca2857595d40f17b0/Libs/Widgets/ctkMaterialPropertyPreviewLabel.cpp
-===================================================================
---- CTK-bdc8caca0458759e1672a94ca2857595d40f17b0.orig/Libs/Widgets/ctkMaterialPropertyPreviewLabel.cpp
-+++ CTK-bdc8caca0458759e1672a94ca2857595d40f17b0/Libs/Widgets/ctkMaterialPropertyPreviewLabel.cpp
-@@ -295,7 +295,7 @@ void ctkMaterialPropertyPreviewLabel::dr
-         ref.setZ( 2.*normal.z()*dot - light.z());
-         ref.normalize();
- 
--        qreal diffuseComp = qMax(diffuse * dot, 0.);
-+        qreal diffuseComp = qMax<qreal>(diffuse * dot, 0.);
- 
-         qreal specularDot = qMax(static_cast<qreal>(QVector3D::dotProduct(ref, view)), static_cast<qreal>(0));
- 
-@@ -315,10 +315,10 @@ void ctkMaterialPropertyPreviewLabel::dr
-           }
-         else
-           {
--          rgba = qRgba(static_cast<unsigned char>(qMin(255. * intensity.x() * opacity + qRed(rgba)*(1. - opacity), static_cast<qreal>(255.))),
--                       static_cast<unsigned char>(qMin(255. * intensity.y() * opacity + qGreen(rgba)*(1. - opacity), static_cast<qreal>(255.))),
--                       static_cast<unsigned char>(qMin(255. * intensity.z() * opacity + qBlue(rgba)*(1. - opacity), static_cast<qreal>(255.))),
--                       static_cast<unsigned char>(qMin(255. * opacity + qAlpha(rgba)*(1. - opacity), static_cast<qreal>(255.))));
-+          rgba = qRgba(static_cast<unsigned char>(qMin<qreal>(255. * intensity.x() * opacity + qRed(rgba)*(1. - opacity), static_cast<qreal>(255.))),
-+                       static_cast<unsigned char>(qMin<qreal>(255. * intensity.y() * opacity + qGreen(rgba)*(1. - opacity), static_cast<qreal>(255.))),
-+                       static_cast<unsigned char>(qMin<qreal>(255. * intensity.z() * opacity + qBlue(rgba)*(1. - opacity), static_cast<qreal>(255.))),
-+                       static_cast<unsigned char>(qMin<qreal>(255. * opacity + qAlpha(rgba)*(1. - opacity), static_cast<qreal>(255.))));
-           }
-         }
-       image.setPixel(i,j,rgba);
-Index: CTK-bdc8caca0458759e1672a94ca2857595d40f17b0/Libs/Widgets/ctkTransferFunctionBarsItem.cpp
-===================================================================
---- CTK-bdc8caca0458759e1672a94ca2857595d40f17b0.orig/Libs/Widgets/ctkTransferFunctionBarsItem.cpp
-+++ CTK-bdc8caca0458759e1672a94ca2857595d40f17b0/Libs/Widgets/ctkTransferFunctionBarsItem.cpp
-@@ -92,7 +92,7 @@ ctkTransferFunctionBarsItem::~ctkTransfe
- void ctkTransferFunctionBarsItem::setBarWidth(qreal newBarWidthRatio)
- {
-   Q_D(ctkTransferFunctionBarsItem);
--  newBarWidthRatio = qBound(0., newBarWidthRatio, 1.);
-+  newBarWidthRatio = qBound<qreal>(0., newBarWidthRatio, 1.);
-   if (d->BarWidthRatio == newBarWidthRatio)
-     {
-     return;
diff --git a/ctk.spec b/ctk.spec
index 41d2d31..a3088ab 100644
--- a/ctk.spec
+++ b/ctk.spec
@@ -1,17 +1,16 @@
-%global commit bdc8caca0458759e1672a94ca2857595d40f17b0
+%global commit 71799c27da506c899f2ef04b50cd8d454374870d
 %global comm %(c=%{commit}; echo ${c:0:7})
-%global checkout 20151015git%{comm}
+%global checkout 20171224git%{comm}
 %global _docdir_fmt %{name}
 
 Name:		ctk
 Version:	0.1
-Release:	0.6.%{checkout}%{?dist}
+Release:	0.7.%{checkout}%{?dist}
 Summary:	The Commmon Toolkit for biomedical imaging
 
 License:	ASL 2.0
 URL:		http://www.commontk.org
 Source0:	https://github.com/commontk/CTK/archive/%{commit}.tar.gz#/CTK-%{commit}.tar.gz
-Patch0:		ctk-qreal_not_double.patch
 
 BuildRequires:	gcc-c++
 BuildRequires:	cmake
@@ -182,6 +181,9 @@ popd
 
 
 %changelog
+* Wed Jan 03 2018 Björn Esser <besser82@fedoraproject.org> - 0.1-0.7.20171224git71799c2
+- Update to recent snapshot
+
 * Wed Jan 03 2018 Björn Esser <besser82@fedoraproject.org> - 0.1-0.6.20151015gitbdc8cac
 - Rebuilt for dcmtk
 
diff --git a/sources b/sources
index c57d173..cab76e9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d65b038c5dfb9dc98ba8575a97abac12  CTK-bdc8caca0458759e1672a94ca2857595d40f17b0.tar.gz
+SHA512 (CTK-71799c27da506c899f2ef04b50cd8d454374870d.tar.gz) = 6337fea44015db60f775ccbfa53a822a9b64283c07e09f9a2974466422eb8880b99b40dc538e7aae5518cd4f5e89b741e697810617e0eb37d8680ba72d0e0758