Fix code and tests so that SubtitleString::v_position is between 0 and 1 (not a perce...

[libdcp.git] / src / mono_picture_mxf.cc

diff --git a/src/mono_picture_mxf.cc b/src/mono_picture_mxf.cc
index 66cfa12cba3a402b30fde50f800f393873bddc97..4114f5ade6f146075904b0dc9ff5b96b29e359a8 100644 (file)
--- a/src/mono_picture_mxf.cc
+++ b/src/mono_picture_mxf.cc
@@ -22,6 +22,7 @@
 #include "AS_DCP.h"
 #include "KM_fileio.h"
 #include "exceptions.h"
+#include "dcp_assert.h"
 #include "mono_picture_frame.h"
 #include "compose.hpp"
 
@@ -69,7 +70,7 @@ MonoPictureMXF::get_frame (int n) const
 }
 
 bool
-MonoPictureMXF::equals (shared_ptr<const Asset> other, EqualityOptions opt, boost::function<void (NoteType, string)> note) const
+MonoPictureMXF::equals (shared_ptr<const Asset> other, EqualityOptions opt, NoteHandler note) const
 {
        if (!dynamic_pointer_cast<const MonoPictureMXF> (other)) {
                return false;
@@ -105,7 +106,7 @@ MonoPictureMXF::equals (shared_ptr<const Asset> other, EqualityOptions opt, boos
        }
 
        shared_ptr<const MonoPictureMXF> other_picture = dynamic_pointer_cast<const MonoPictureMXF> (other);
-       assert (other_picture);
+       DCP_ASSERT (other_picture);
 
        for (int i = 0; i < _intrinsic_duration; ++i) {
                if (i >= other_picture->intrinsic_duration()) {