83 lines
2.6 KiB
Diff
83 lines
2.6 KiB
Diff
|
Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/src/colour_button.cpp
|
||
|
|
===================================================================
|
||
|
|
--- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/src/colour_button.cpp 2018-07-10 00:06:51.000000000 +0200
|
||
|
|
+++ Aegisub-524c6114a82157b143567240884de3a6d030b091/src/colour_button.cpp 2019-03-29 13:05:42.776195551 +0200
|
||
|
|
@@ -18,8 +18,16 @@
|
||
|
|
|
||
|
|
#include "dialogs.h"
|
||
|
|
|
||
|
|
+#if BOOST_VERSION >= 106900
|
||
|
|
+
|
||
|
|
+#include <boost/gil.hpp>
|
||
|
|
+
|
||
|
|
+#else
|
||
|
|
+
|
||
|
|
#include <boost/gil/gil_all.hpp>
|
||
|
|
|
||
|
|
+#endif
|
||
|
|
+
|
||
|
|
AGI_DEFINE_EVENT(EVT_COLOR, agi::Color);
|
||
|
|
|
||
|
|
ColourButton::ColourButton(wxWindow *parent, wxSize const& size, bool alpha, agi::Color col, wxValidator const& validator)
|
||
|
|
Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/src/video_provider_dummy.cpp
|
||
|
|
===================================================================
|
||
|
|
--- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/src/video_provider_dummy.cpp 2018-07-10 00:06:51.000000000 +0200
|
||
|
|
+++ Aegisub-524c6114a82157b143567240884de3a6d030b091/src/video_provider_dummy.cpp 2019-03-29 13:07:20.480135858 +0200
|
||
|
|
@@ -45,8 +45,16 @@
|
||
|
|
#include <boost/algorithm/string/predicate.hpp>
|
||
|
|
#include <boost/filesystem/path.hpp>
|
||
|
|
#include <libaegisub/format.h>
|
||
|
|
+#if BOOST_VERSION >= 106900
|
||
|
|
+
|
||
|
|
+#include <boost/gil.hpp>
|
||
|
|
+
|
||
|
|
+#else
|
||
|
|
+
|
||
|
|
#include <boost/gil/gil_all.hpp>
|
||
|
|
|
||
|
|
+#endif
|
||
|
|
+
|
||
|
|
DummyVideoProvider::DummyVideoProvider(double fps, int frames, int width, int height, agi::Color colour, bool pattern)
|
||
|
|
: framecount(frames)
|
||
|
|
, fps(fps)
|
||
|
|
Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/src/video_frame.cpp
|
||
|
|
===================================================================
|
||
|
|
--- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/src/video_frame.cpp 2018-07-10 00:06:51.000000000 +0200
|
||
|
|
+++ Aegisub-524c6114a82157b143567240884de3a6d030b091/src/video_frame.cpp 2019-03-29 13:08:04.509911568 +0200
|
||
|
|
@@ -16,7 +16,15 @@
|
||
|
|
|
||
|
|
#include "video_frame.h"
|
||
|
|
|
||
|
|
+#if BOOST_VERSION >= 106900
|
||
|
|
+
|
||
|
|
+#include <boost/gil.hpp>
|
||
|
|
+
|
||
|
|
+#else
|
||
|
|
+
|
||
|
|
#include <boost/gil/gil_all.hpp>
|
||
|
|
+
|
||
|
|
+#endif
|
||
|
|
#include <wx/image.h>
|
||
|
|
|
||
|
|
namespace {
|
||
|
|
Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/src/subtitles_provider_libass.cpp
|
||
|
|
===================================================================
|
||
|
|
--- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/src/subtitles_provider_libass.cpp 2018-07-10 00:06:51.000000000 +0200
|
||
|
|
+++ Aegisub-524c6114a82157b143567240884de3a6d030b091/src/subtitles_provider_libass.cpp 2019-03-29 13:08:57.240038186 +0200
|
||
|
|
@@ -46,7 +46,15 @@
|
||
|
|
#include <libaegisub/util.h>
|
||
|
|
|
||
|
|
#include <atomic>
|
||
|
|
+#if BOOST_VERSION >= 106900
|
||
|
|
+
|
||
|
|
+#include <boost/gil.hpp>
|
||
|
|
+
|
||
|
|
+#else
|
||
|
|
+
|
||
|
|
#include <boost/gil/gil_all.hpp>
|
||
|
|
+
|
||
|
|
+#endif
|
||
|
|
#include <memory>
|
||
|
|
#include <mutex>
|
||
|
|
|