Blob Blame Raw
From d813fb7f03ebac14f46f1d4663451758dfb14ac1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu@fedoraproject.org>
Date: Fri, 15 Feb 2019 08:37:45 +0100
Subject: [PATCH 104/105] Include boost/gil.hpp instead of
 boost/gil/gil_all.hpp for boost > 1.69

---
 k3dsdk/bitmap.h                   | 5 +++++
 k3dsdk/istreaming_bitmap_source.h | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/k3dsdk/bitmap.h b/k3dsdk/bitmap.h
index b186fd5d..d9b5c58e 100644
--- a/k3dsdk/bitmap.h
+++ b/k3dsdk/bitmap.h
@@ -33,7 +33,12 @@
 #include <iostream>
 #include <string>
 
+#include <boost/version.hpp>
+#if BOOST_VERSION < 106900
 #include <boost/gil/gil_all.hpp>
+#else
+#include <boost/gil.hpp>
+#endif
 
 namespace boost
 {
diff --git a/k3dsdk/istreaming_bitmap_source.h b/k3dsdk/istreaming_bitmap_source.h
index e8f86b2d..d5681a3c 100644
--- a/k3dsdk/istreaming_bitmap_source.h
+++ b/k3dsdk/istreaming_bitmap_source.h
@@ -28,7 +28,12 @@
 #include <k3dsdk/iunknown.h>
 #include <k3dsdk/signal_system.h>
 
+#include <boost/version.hpp>
+#if BOOST_VERSION < 106900
 #include <boost/gil/gil_all.hpp>
+#else
+#include <boost/gil.hpp>
+#endif
 
 namespace k3d
 {
-- 
2.20.1