Blob Blame Raw
From ed2005d5b7c9c48e9ffab529d19cc0192d87ce0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu@fedoraproject.org>
Date: Tue, 19 Feb 2019 07:55:45 +0100
Subject: [PATCH 105/105] Include boost/gil.hpp instead of
 boost/gil/gil_config.hpp for boost > 1.69

---
 k3dsdk/gil/boost/gil/extension/numeric/algorithm.hpp       | 7 ++++++-
 .../gil/extension/numeric/channel_numeric_operations.hpp   | 7 ++++++-
 k3dsdk/gil/boost/gil/extension/numeric/convolve.hpp        | 7 ++++++-
 k3dsdk/gil/boost/gil/extension/numeric/kernel.hpp          | 7 ++++++-
 .../gil/extension/numeric/pixel_numeric_operations.hpp     | 7 ++++++-
 5 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/k3dsdk/gil/boost/gil/extension/numeric/algorithm.hpp b/k3dsdk/gil/boost/gil/extension/numeric/algorithm.hpp
index 5fc44f61..5c18b16b 100644
--- a/k3dsdk/gil/boost/gil/extension/numeric/algorithm.hpp
+++ b/k3dsdk/gil/boost/gil/extension/numeric/algorithm.hpp
@@ -21,7 +21,12 @@
 #include <iterator>
 #include <algorithm>
 #include <numeric>
-#include <boost/gil/gil_config.hpp>
+#include <boost/version.hpp>
+#if BOOST_VERSION < 106900
+#include <boost/gil/gil_config.hpp>
+#else
+#include <boost/gil.hpp>
+#endif
 #include <boost/gil/pixel_iterator.hpp>
 #include <boost/gil/metafunctions.hpp>
 
diff --git a/k3dsdk/gil/boost/gil/extension/numeric/channel_numeric_operations.hpp b/k3dsdk/gil/boost/gil/extension/numeric/channel_numeric_operations.hpp
index 06d07358..d53d22b5 100644
--- a/k3dsdk/gil/boost/gil/extension/numeric/channel_numeric_operations.hpp
+++ b/k3dsdk/gil/boost/gil/extension/numeric/channel_numeric_operations.hpp
@@ -24,7 +24,12 @@
 */
 
 #include <functional>
-#include <boost/gil/gil_config.hpp>
+#include <boost/version.hpp>
+#if BOOST_VERSION < 106900
+#include <boost/gil/gil_config.hpp>
+#else
+#include <boost/gil.hpp>
+#endif
 #include <boost/gil/channel.hpp>
 
 namespace boost { namespace gil {
diff --git a/k3dsdk/gil/boost/gil/extension/numeric/convolve.hpp b/k3dsdk/gil/boost/gil/extension/numeric/convolve.hpp
index db962099..f0eff96a 100644
--- a/k3dsdk/gil/boost/gil/extension/numeric/convolve.hpp
+++ b/k3dsdk/gil/boost/gil/extension/numeric/convolve.hpp
@@ -24,7 +24,12 @@
 #include <algorithm>
 #include <vector>
 #include <functional>
-#include <boost/gil/gil_config.hpp>
+#include <boost/version.hpp>
+#if BOOST_VERSION < 106900
+#include <boost/gil/gil_config.hpp>
+#else
+#include <boost/gil.hpp>
+#endif
 #include <boost/gil/image_view_factory.hpp>
 #include <boost/gil/algorithm.hpp>
 #include <boost/gil/metafunctions.hpp>
diff --git a/k3dsdk/gil/boost/gil/extension/numeric/kernel.hpp b/k3dsdk/gil/boost/gil/extension/numeric/kernel.hpp
index 9375d9c5..aa5401e3 100644
--- a/k3dsdk/gil/boost/gil/extension/numeric/kernel.hpp
+++ b/k3dsdk/gil/boost/gil/extension/numeric/kernel.hpp
@@ -22,8 +22,13 @@
 #include <algorithm>
 #include <vector>
 #include <memory>
+#include <boost/version.hpp>
+#if BOOST_VERSION < 106900
+#include <boost/gil/gil_config.hpp>
+#else
+#include <boost/gil.hpp>
+#endif
 #include <boost/array.hpp>
-#include <boost/gil/gil_config.hpp>
 #include <boost/gil/utilities.hpp>
 
 namespace boost { namespace gil {
diff --git a/k3dsdk/gil/boost/gil/extension/numeric/pixel_numeric_operations.hpp b/k3dsdk/gil/boost/gil/extension/numeric/pixel_numeric_operations.hpp
index e7690b21..070e849e 100644
--- a/k3dsdk/gil/boost/gil/extension/numeric/pixel_numeric_operations.hpp
+++ b/k3dsdk/gil/boost/gil/extension/numeric/pixel_numeric_operations.hpp
@@ -23,7 +23,12 @@
 */
 
 #include <functional>
-#include <boost/gil/gil_config.hpp>
+#include <boost/version.hpp>
+#if BOOST_VERSION < 106900
+#include <boost/gil/gil_config.hpp>
+#else
+#include <boost/gil.hpp>
+#endif
 #include <boost/gil/pixel.hpp>
 #include <boost/gil/color_base_algorithm.hpp>
 #include "channel_numeric_operations.hpp"
-- 
2.20.1