5d384d1704
In file included from src/save_map.cpp:40:
include/mapnik/image_filter.hpp:34:10: fatal error: 'boost/gil/gil_all.hpp' file not found
#include <boost/gil/gil_all.hpp>
^~~~~~~~~~~~~~~~~~~~~~~
deps/agg/src/agg_pixfmt_rgba.cpp:6:10: fatal error: 'boost/gil/gil_all.hpp' file not found
#include <boost/gil/gil_all.hpp>
^~~~~~~~~~~~~~~~~~~~~~~
PR: 232525
63 lines
1.6 KiB
Plaintext
63 lines
1.6 KiB
Plaintext
https://github.com/mapnik/mapnik/issues/4000
|
|
|
|
--- deps/agg/src/agg_pixfmt_rgba.cpp.orig 2015-11-26 14:32:15 UTC
|
|
+++ deps/agg/src/agg_pixfmt_rgba.cpp
|
|
@@ -3,7 +3,12 @@
|
|
|
|
#pragma GCC diagnostic push
|
|
#include <mapnik/warning_ignore.hpp>
|
|
+#include <boost/version.hpp>
|
|
+#if BOOST_VERSION >= 106900
|
|
+#include <boost/gil.hpp>
|
|
+#else
|
|
#include <boost/gil/gil_all.hpp>
|
|
+#endif
|
|
#include <boost/gil/extension/toolbox/hsv.hpp>
|
|
#include <boost/gil/extension/toolbox/hsl.hpp>
|
|
#pragma GCC diagnostic pop
|
|
--- deps/boost/gil/extension/toolbox/hsl.hpp.orig 2015-11-26 14:32:15 UTC
|
|
+++ deps/boost/gil/extension/toolbox/hsl.hpp
|
|
@@ -16,7 +16,12 @@
|
|
|
|
#pragma GCC diagnostic push
|
|
#include <mapnik/warning_ignore.hpp>
|
|
+#include <boost/version.hpp>
|
|
+#if BOOST_VERSION >= 106900
|
|
+#include <boost/gil.hpp>
|
|
+#else
|
|
#include <boost/gil/gil_all.hpp>
|
|
+#endif
|
|
#pragma GCC diagnostic pop
|
|
|
|
namespace boost { namespace gil {
|
|
--- deps/boost/gil/extension/toolbox/hsv.hpp.orig 2015-11-26 14:32:15 UTC
|
|
+++ deps/boost/gil/extension/toolbox/hsv.hpp
|
|
@@ -16,7 +16,12 @@
|
|
|
|
#pragma GCC diagnostic push
|
|
#include <mapnik/warning_ignore.hpp>
|
|
+#include <boost/version.hpp>
|
|
+#if BOOST_VERSION >= 106900
|
|
+#include <boost/gil.hpp>
|
|
+#else
|
|
#include <boost/gil/gil_all.hpp>
|
|
+#endif
|
|
#pragma GCC diagnostic pop
|
|
|
|
namespace boost { namespace gil {
|
|
--- include/mapnik/image_filter.hpp.orig 2015-11-26 14:32:15 UTC
|
|
+++ include/mapnik/image_filter.hpp
|
|
@@ -31,7 +31,12 @@
|
|
|
|
#pragma GCC diagnostic push
|
|
#include <mapnik/warning_ignore.hpp>
|
|
+#include <boost/version.hpp>
|
|
+#if BOOST_VERSION >= 106900
|
|
+#include <boost/gil.hpp>
|
|
+#else
|
|
#include <boost/gil/gil_all.hpp>
|
|
+#endif
|
|
#pragma GCC diagnostic pop
|
|
|
|
// agg
|