projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix old C++ syntax.
[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 72698fa51cc49b2a947abde2fedf87ed2d461cd8..1101901b7f1b20a83a192129b8361f5ce4d9cba5 100644
(file)
--- a/
src/lib/ffmpeg_subtitle_stream.cc
+++ b/
src/lib/ffmpeg_subtitle_stream.cc
@@
-19,12
+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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <libxml++/libxml++.h>
#include <libxml++/libxml++.h>
-DCPOMATIC_ENABLE_WARNINGS
-#include <boost/foreach.hpp>
+LIBDCP_ENABLE_WARNINGS
#include <iostream>
using std::string;
#include <iostream>
using std::string;
@@
-43,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"));
}
}