projects
/
libdcp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Express colour conversions as chromaticities and adjust so that
[libdcp.git]
/
src
/
stereo_picture_mxf.cc
diff --git
a/src/stereo_picture_mxf.cc
b/src/stereo_picture_mxf.cc
index 0188e4e7876cb60fba975255a1043753150e6184..e68921e3f9e9a605b80011deab3104fd5b9b610a 100644
(file)
--- a/
src/stereo_picture_mxf.cc
+++ b/
src/stereo_picture_mxf.cc
@@
-22,6
+22,7
@@
#include "stereo_picture_frame.h"
#include "exceptions.h"
#include "stereo_picture_mxf_writer.h"
#include "stereo_picture_frame.h"
#include "exceptions.h"
#include "stereo_picture_mxf_writer.h"
+#include "dcp_assert.h"
using std::string;
using std::pair;
using std::string;
using std::pair;
@@
-74,7
+75,7
@@
StereoPictureMXF::start_write (boost::filesystem::path file, Standard standard,
}
bool
}
bool
-StereoPictureMXF::equals (shared_ptr<const
Content> other, EqualityOptions opt, boost::function<void (NoteType, string)>
note) const
+StereoPictureMXF::equals (shared_ptr<const
Asset> other, EqualityOptions opt, NoteHandler
note) const
{
if (!MXF::equals (other, opt, note)) {
return false;
{
if (!MXF::equals (other, opt, note)) {
return false;
@@
-106,7
+107,7
@@
StereoPictureMXF::equals (shared_ptr<const Content> other, EqualityOptions opt,
}
shared_ptr<const StereoPictureMXF> other_picture = dynamic_pointer_cast<const StereoPictureMXF> (other);
}
shared_ptr<const StereoPictureMXF> other_picture = dynamic_pointer_cast<const StereoPictureMXF> (other);
-
assert
(other_picture);
+
DCP_ASSERT
(other_picture);
for (int i = 0; i < _intrinsic_duration; ++i) {
shared_ptr<const StereoPictureFrame> frame_A = get_frame (i);
for (int i = 0; i < _intrinsic_duration; ++i) {
shared_ptr<const StereoPictureFrame> frame_A = get_frame (i);