Attachment #582358 for bug #689196

Lines 18-24 Link Here

(-)a/src/colour_button.cpp (+4 lines)
18		18
19	#include "dialogs.h"	19	#include "dialogs.h"
20		20
		21	#if BOOST_VERSION >= 106900
		22	#include <boost/gil.hpp>
		23	#else
21	#include <boost/gil/gil_all.hpp>	24	#include <boost/gil/gil_all.hpp>
		25	#endif
22		26
23	AGI_DEFINE_EVENT(EVT_COLOR, agi::Color);	27	AGI_DEFINE_EVENT(EVT_COLOR, agi::Color);
24		28

Lines 46-52 Link Here

(-)a/src/subtitles_provider_libass.cpp (+4 lines)
46	#include <libaegisub/util.h>	46	#include <libaegisub/util.h>
47		47
48	#include <atomic>	48	#include <atomic>
		49	#if BOOST_VERSION >= 106900
		50	#include <boost/gil.hpp>
		51	#else
49	#include <boost/gil/gil_all.hpp>	52	#include <boost/gil/gil_all.hpp>
		53	#endif
50	#include <memory>	54	#include <memory>
51	#include <mutex>	55	#include <mutex>
52		56

Lines 45-51 Link Here

(-)a/src/video_provider_dummy.cpp (+4 lines)
45	#include <boost/algorithm/string/predicate.hpp>	45	#include <boost/algorithm/string/predicate.hpp>
46	#include <boost/filesystem/path.hpp>	46	#include <boost/filesystem/path.hpp>
47	#include <libaegisub/format.h>	47	#include <libaegisub/format.h>
		48	#if BOOST_VERSION >= 106900
		49	#include <boost/gil.hpp>
		50	#else
48	#include <boost/gil/gil_all.hpp>	51	#include <boost/gil/gil_all.hpp>
		52	#endif
49		53
50	DummyVideoProvider::DummyVideoProvider(double fps, int frames, int width, int height, agi::Color colour, bool pattern)	54	DummyVideoProvider::DummyVideoProvider(double fps, int frames, int width, int height, agi::Color colour, bool pattern)
51	: framecount(frames)	55	: framecount(frames)

Return to bug 689196