sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix Boost.GIL includes for BOOST_VERSION >= 1.69 (ref #4000)

Browse source
This commit is contained in:
Artem Pavlenko 2018-12-13 15:46:57 +00:00
parent 24425f9ba5
commit 4698d43234
4 changed files with 54 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
deps/agg/src/agg_pixfmt_rgba.cpp vendored
View file

@ -1,9 +1,13 @@
#include "agg_pixfmt_rgba.h"
#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

5
deps/boost/gil/extension/toolbox/hsl.hpp vendored
View file

@ -16,7 +16,12 @@
#pragma GCC diagnostic push
#include <mapnik/warning_ignore.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 {

5
deps/boost/gil/extension/toolbox/hsv.hpp vendored
View file

@ -16,7 +16,12 @@
#pragma GCC diagnostic push
#include <mapnik/warning_ignore.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 {

4
include/mapnik/image_filter.hpp
View file

@ -31,7 +31,11 @@
#pragma GCC diagnostic push
#include <mapnik/warning_ignore.hpp>
#if BOOST_VERSION >= 106900
#include <boost/gil.hpp>
#else
#include <boost/gil/gil_all.hpp>
#endif
#pragma GCC diagnostic pop
#pragma GCC diagnostic push