projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
BOOST_FOREACH.
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_subtitle_stream.cc
diff --git
a/src/lib/ffmpeg_subtitle_stream.cc
b/src/lib/ffmpeg_subtitle_stream.cc
index da8bafc0af788a3c76328b6b7ef5a54445f2c1f1..e500dd35b6294b91c6750ae6532ef3ae0fdddca1 100644
(file)
--- a/
src/lib/ffmpeg_subtitle_stream.cc
+++ b/
src/lib/ffmpeg_subtitle_stream.cc
@@
-19,9
+19,11
@@
*/
#include "ffmpeg_subtitle_stream.h"
*/
#include "ffmpeg_subtitle_stream.h"
+#include "warnings.h"
#include <dcp/raw_convert.h>
#include <dcp/raw_convert.h>
+DCPOMATIC_DISABLE_WARNINGS
#include <libxml++/libxml++.h>
#include <libxml++/libxml++.h>
-#include <boost/foreach.hpp>
+DCPOMATIC_ENABLE_WARNINGS
#include <iostream>
using std::string;
#include <iostream>
using std::string;
@@
-40,7
+42,7
@@
FFmpegSubtitleStream::FFmpegSubtitleStream (cxml::ConstNodePtr node, int version
{
if (version >= 33) {
boost::mutex::scoped_lock lm (_mutex);
{
if (version >= 33) {
boost::mutex::scoped_lock lm (_mutex);
-
BOOST_FOREACH (cxml::NodePtr i,
node->node_children ("Colour")) {
+
for (auto i:
node->node_children ("Colour")) {
_colours[RGBA(i->node_child("From"))] = RGBA (i->node_child("To"));
}
}
_colours[RGBA(i->node_child("From"))] = RGBA (i->node_child("To"));
}
}