67 lines
1.9 KiB
Diff
67 lines
1.9 KiB
Diff
|
From bb1f66a01f6e4661ab9c6610c5c2eee67bd0bd61 Mon Sep 17 00:00:00 2001
|
||
|
|
From: wangqr <wangqr@wangqr.tk>
|
||
|
|
Date: Thu, 15 Nov 2018 12:42:53 -0500
|
||
|
|
Subject: [PATCH] Bump boost version to 1.69.0.beta1
|
||
|
|
|
||
|
|
Fix Aegisub/Aegisub#93
|
||
|
|
---
|
||
|
|
src/colour_button.cpp | 2 +-
|
||
|
|
src/subtitles_provider_libass.cpp | 2 +-
|
||
|
|
src/video_frame.cpp | 2 +-
|
||
|
|
src/video_provider_dummy.cpp | 2 +-
|
||
|
|
vendor/boost | 2 +-
|
||
|
|
5 files changed, 5 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/colour_button.cpp b/src/colour_button.cpp
|
||
|
|
index c0b1c5d58..48a87856c 100644
|
||
|
|
--- src/colour_button.cpp
|
||
|
|
+++ src/colour_button.cpp
|
||
|
|
@@ -18,7 +18,7 @@
|
||
|
|
|
||
|
|
#include "dialogs.h"
|
||
|
|
|
||
|
|
-#include <boost/gil/gil_all.hpp>
|
||
|
|
+#include <boost/gil.hpp>
|
||
|
|
|
||
|
|
AGI_DEFINE_EVENT(EVT_COLOR, agi::Color);
|
||
|
|
|
||
|
|
diff --git a/src/subtitles_provider_libass.cpp b/src/subtitles_provider_libass.cpp
|
||
|
|
index efb5cb481..fb62e3334 100644
|
||
|
|
--- src/subtitles_provider_libass.cpp
|
||
|
|
+++ src/subtitles_provider_libass.cpp
|
||
|
|
@@ -46,7 +46,7 @@
|
||
|
|
#include <libaegisub/util.h>
|
||
|
|
|
||
|
|
#include <atomic>
|
||
|
|
-#include <boost/gil/gil_all.hpp>
|
||
|
|
+#include <boost/gil.hpp>
|
||
|
|
#include <memory>
|
||
|
|
#include <mutex>
|
||
|
|
|
||
|
|
diff --git a/src/video_frame.cpp b/src/video_frame.cpp
|
||
|
|
index 610005879..c51f929ac 100644
|
||
|
|
--- src/video_frame.cpp
|
||
|
|
+++ src/video_frame.cpp
|
||
|
|
@@ -16,7 +16,7 @@
|
||
|
|
|
||
|
|
#include "video_frame.h"
|
||
|
|
|
||
|
|
-#include <boost/gil/gil_all.hpp>
|
||
|
|
+#include <boost/gil.hpp>
|
||
|
|
#include <wx/image.h>
|
||
|
|
|
||
|
|
namespace {
|
||
|
|
diff --git a/src/video_provider_dummy.cpp b/src/video_provider_dummy.cpp
|
||
|
|
index b68b206b7..eca5ac261 100644
|
||
|
|
--- src/video_provider_dummy.cpp
|
||
|
|
+++ src/video_provider_dummy.cpp
|
||
|
|
@@ -45,7 +45,7 @@
|
||
|
|
#include <boost/algorithm/string/predicate.hpp>
|
||
|
|
#include <boost/filesystem/path.hpp>
|
||
|
|
#include <libaegisub/format.h>
|
||
|
|
-#include <boost/gil/gil_all.hpp>
|
||
|
|
+#include <boost/gil.hpp>
|
||
|
|
|
||
|
|
DummyVideoProvider::DummyVideoProvider(double fps, int frames, int width, int height, agi::Color colour, bool pattern)
|
||
|
|
: framecount(frames)
|