]>
Commit | Line | Data |
---|---|---|
108e8929 AG |
1 | --- aegisub-3.2.2/src/colour_button.cpp.orig 2019-04-15 08:43:16.415251576 +0200 |
2 | +++ aegisub-3.2.2/src/colour_button.cpp 2019-04-15 08:44:56.040476824 +0200 | |
3 | @@ -18,7 +18,7 @@ | |
4 | ||
5 | #include "dialogs.h" | |
6 | ||
7 | -#include <boost/gil/gil_all.hpp> | |
8 | +#include <boost/gil.hpp> | |
9 | ||
10 | wxDEFINE_EVENT(EVT_COLOR, wxThreadEvent); | |
11 | ||
12 | --- aegisub-3.2.2/src/subtitles_provider_libass.cpp~ 2014-12-08 01:07:09.000000000 +0100 | |
13 | +++ aegisub-3.2.2/src/subtitles_provider_libass.cpp 2019-04-15 08:49:46.265809744 +0200 | |
14 | @@ -50,7 +50,7 @@ | |
15 | #include <libaegisub/util.h> | |
16 | ||
17 | #include <atomic> | |
18 | -#include <boost/gil/gil_all.hpp> | |
19 | +#include <boost/gil.hpp> | |
20 | #include <memory> | |
21 | #include <mutex> | |
22 | ||
23 | --- aegisub-3.2.2/src/video_frame.cpp~ 2014-12-08 01:07:09.000000000 +0100 | |
24 | +++ aegisub-3.2.2/src/video_frame.cpp 2019-04-15 09:02:28.425810852 +0200 | |
25 | @@ -16,7 +16,7 @@ | |
26 | ||
27 | #include "video_frame.h" | |
28 | ||
29 | -#include <boost/gil/gil_all.hpp> | |
30 | +#include <boost/gil.hpp> | |
31 | #include <wx/image.h> | |
32 | ||
33 | namespace { | |
34 | --- aegisub-3.2.2/src/video_provider_dummy.cpp~ 2014-12-08 01:07:09.000000000 +0100 | |
35 | +++ aegisub-3.2.2/src/video_provider_dummy.cpp 2019-04-15 09:03:44.153106555 +0200 | |
36 | @@ -46,7 +46,7 @@ | |
37 | #include <boost/algorithm/string/split.hpp> | |
38 | #include <boost/filesystem/path.hpp> | |
39 | #include <libaegisub/format.h> | |
40 | -#include <boost/gil/gil_all.hpp> | |
41 | +#include <boost/gil.hpp> | |
42 | ||
43 | DummyVideoProvider::DummyVideoProvider(double fps, int frames, int width, int height, agi::Color colour, bool pattern) | |
44 | : framecount(frames) |