projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No-op: remove all trailing whitespace.
[dcpomatic.git]
/
test
/
recover_test.cc
diff --git
a/test/recover_test.cc
b/test/recover_test.cc
index 92eae27eb9e8cf4ce734cea3878f0f0de8464327..ef60a56ab99704f6c92d25b92e6ebce1b011d858 100644
(file)
--- a/
test/recover_test.cc
+++ b/
test/recover_test.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014
-2015
Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-22,7
+22,7
@@
*/
#include <boost/test/unit_test.hpp>
*/
#include <boost/test/unit_test.hpp>
-#include <dcp/stereo_picture_
mxf
.h>
+#include <dcp/stereo_picture_
asset
.h>
#include "lib/film.h"
#include "lib/dcp_content_type.h"
#include "lib/image_content.h"
#include "lib/film.h"
#include "lib/dcp_content_type.h"
#include "lib/image_content.h"
@@
-57,22
+57,21
@@
BOOST_AUTO_TEST_CASE (recover_test)
film->make_dcp ();
wait_for_jobs ();
film->make_dcp ();
wait_for_jobs ();
- boost::filesystem::path const video = "build/test/recover_test/video/185_2K_
1133fd57e751ce3e82146492466365f9_24_bicubic
_100000000_P_S_3D.mxf";
+ boost::filesystem::path const video = "build/test/recover_test/video/185_2K_
0e7cded8bd5cb8143184fc7729be136e_24
_100000000_P_S_3D.mxf";
boost::filesystem::copy_file (
video,
"build/test/recover_test/original.mxf"
);
boost::filesystem::copy_file (
video,
"build/test/recover_test/original.mxf"
);
-
+
boost::filesystem::resize_file (video, 2 * 1024 * 1024);
film->make_dcp ();
wait_for_jobs ();
boost::filesystem::resize_file (video, 2 * 1024 * 1024);
film->make_dcp ();
wait_for_jobs ();
- shared_ptr<dcp::StereoPicture
MXF> A (new dcp::StereoPictureMXF
("build/test/recover_test/original.mxf"));
- shared_ptr<dcp::StereoPicture
MXF> B (new dcp::StereoPictureMXF
(video));
+ shared_ptr<dcp::StereoPicture
Asset> A (new dcp::StereoPictureAsset
("build/test/recover_test/original.mxf"));
+ shared_ptr<dcp::StereoPicture
Asset> B (new dcp::StereoPictureAsset
(video));
dcp::EqualityOptions eq;
dcp::EqualityOptions eq;
- eq.mxf_names_can_differ = true;
BOOST_CHECK (A->equals (B, eq, boost::bind (¬e, _1, _2)));
}
BOOST_CHECK (A->equals (B, eq, boost::bind (¬e, _1, _2)));
}