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

Fixes for Boost 1.69.0

Browse source
This commit is contained in:
scx 2019-09-07 20:55:07 +02:00 committed by Thomas Goyne
parent 7094bd1e20
commit c3c446a8d6
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" #include "dialogs.h"
#if BOOST_VERSION >= 106900
#include <boost/gil.hpp>
#else
#include <boost/gil/gil_all.hpp> #include <boost/gil/gil_all.hpp>
#endif
AGI_DEFINE_EVENT(EVT_COLOR, agi::Color); AGI_DEFINE_EVENT(EVT_COLOR, agi::Color);

4
src/subtitles_provider_libass.cpp
View file

@ -46,7 +46,11 @@
#include <libaegisub/util.h> #include <libaegisub/util.h>
#include <atomic> #include <atomic>
#if BOOST_VERSION >= 106900
#include <boost/gil.hpp>
#else
#include <boost/gil/gil_all.hpp> #include <boost/gil/gil_all.hpp>
#endif
#include <memory> #include <memory>
#include <mutex> #include <mutex>

4
src/video_frame.cpp
View file

@ -16,7 +16,11 @@
#include "video_frame.h" #include "video_frame.h"
#if BOOST_VERSION >= 106900
#include <boost/gil.hpp>
#else
#include <boost/gil/gil_all.hpp> #include <boost/gil/gil_all.hpp>
#endif
#include <wx/image.h> #include <wx/image.h>
namespace { namespace {

4
src/video_provider_dummy.cpp
View file

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