projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use make_shared<>.
[dcpomatic.git]
/
test
/
video_content_scale_test.cc
diff --git
a/test/video_content_scale_test.cc
b/test/video_content_scale_test.cc
index 6f5d85a11045d4b2c17b9666f1853af33c62e528..f1edce04150fb1997fe1fc622d8a535761d9e532 100644
(file)
--- a/
test/video_content_scale_test.cc
+++ b/
test/video_content_scale_test.cc
@@
-18,15
+18,17
@@
*/
*/
-#include <boost/test/unit_test.hpp>
#include "lib/ffmpeg_content.h"
#include "lib/ratio.h"
#include "lib/video_content.h"
#include "lib/ffmpeg_content.h"
#include "lib/ratio.h"
#include "lib/video_content.h"
+#include <boost/test/unit_test.hpp>
+#include <boost/make_shared.hpp>
using std::list;
using std::string;
using std::cerr;
using boost::shared_ptr;
using std::list;
using std::string;
using std::cerr;
using boost::shared_ptr;
+using boost::make_shared;
using boost::optional;
static
using boost::optional;
static
@@
-86,11
+88,11
@@
test (dcp::Size content_size, dcp::Size display_size, dcp::Size film_size, Crop
"<SubtitleYScale>0</SubtitleYScale>"
"</Content>";
"<SubtitleYScale>0</SubtitleYScale>"
"</Content>";
- shared_ptr<cxml::Document> doc
(new cxml::Document ()
);
+ shared_ptr<cxml::Document> doc
= make_shared<cxml::Document> (
);
doc->read_string(s.str ());
list<string> notes;
doc->read_string(s.str ());
list<string> notes;
- shared_ptr<FFmpegContent> vc
(new FFmpegContent (film, doc, 10, notes)
);
+ shared_ptr<FFmpegContent> vc
= boost::make_shared<FFmpegContent> (film, doc, 10, notes
);
optional<VideoContentScale> sc;
if (ratio) {
optional<VideoContentScale> sc;
if (ratio) {