mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Adjust boost gil header paths for boost 1.69

Browse source 
boost/gil.hpp was added in 1.68 and boost/gil/gil_all.hpp removed in
1.69.
This commit is contained in:
FichteFoll 2019-02-01 00:14:14 +01:00 committed by Ryan Lucia
parent 7853e7abe2
commit 75fc5f38d7
4 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/colour_button.cpp
View file

@ -18,7 +18,11 @@
#include "dialogs.h"
#if (BOOST_VERSION / 100000) <= 1 && ((BOOST_VERSION / 100) % 1000) <= 67
#include <boost/gil/gil_all.hpp>
#else
#include <boost/gil.hpp>
#endif
AGI_DEFINE_EVENT(EVT_COLOR, agi::Color);

4
src/subtitles_provider_libass.cpp
View file

@ -46,7 +46,11 @@
#include <libaegisub/util.h>
#include <atomic>
#if (BOOST_VERSION / 100000) <= 1 && ((BOOST_VERSION / 100) % 1000) <= 67
#include <boost/gil/gil_all.hpp>
#else
#include <boost/gil.hpp>
#endif
#include <memory>
#include <mutex>

4
src/video_frame.cpp
View file

@ -16,7 +16,11 @@
#include "video_frame.h"
#if (BOOST_VERSION / 100000) <= 1 && ((BOOST_VERSION / 100) % 1000) <= 67
#include <boost/gil/gil_all.hpp>
#else
#include <boost/gil.hpp>
#endif
#include <wx/image.h>
namespace {

4
src/video_provider_dummy.cpp
View file

@ -45,7 +45,11 @@
#include <boost/algorithm/string/predicate.hpp>
#include <boost/filesystem/path.hpp>
#include <libaegisub/format.h>
#if (BOOST_VERSION / 100000) <= 1 && ((BOOST_VERSION / 100) % 1000) <= 67
#include <boost/gil/gil_all.hpp>
#else
#include <boost/gil.hpp>
#endif
DummyVideoProvider::DummyVideoProvider(double fps, int frames, int width, int height, agi::Color colour, bool pattern)
: framecount(frames)