that rely on font metrics still pass.
#include "lib/ratio.h"
#include "lib/text_content.h"
#include "test.h"
+#include <dcp/interop_subtitle_asset.h>
#include <boost/test/unit_test.hpp>
#include <boost/algorithm/string.hpp>
make_and_verify_dcp (film, { dcp::VerificationNote::Code::INVALID_STANDARD });
- /* Find the subtitle file and check it */
- check_xml (subtitle_file(film), TestPaths::private_data() / "DKH_UT_EN20160601def.xml", {"SubtitleID"});
+ auto ref = make_shared<dcp::InteropSubtitleAsset>(TestPaths::private_data() / "DKH_UT_EN20160601def.xml");
+ auto check = make_shared<dcp::InteropSubtitleAsset>(subtitle_file(film));
+
+ dcp::EqualityOptions options;
+ options.max_subtitle_vertical_position_error = 0.1;
+ BOOST_CHECK(ref->equals(check, options, [](dcp::NoteType t, string n) {
+ if (t == dcp::NoteType::ERROR) {
+ std::cerr << n << "\n";
+ }
+ }));
cl.run ();
}
BOOST_REQUIRE_EQUAL(output_subs.size(), 1U);
BOOST_CHECK(output_subs[0]->v_align() == dcp::VAlign::BOTTOM);
- BOOST_CHECK_CLOSE(output_subs[0]->v_position(), 0.07074, 1e-3);
+ BOOST_CHECK_CLOSE(output_subs[0]->v_position(), 0.07074, 2);
}
BOOST_REQUIRE_EQUAL(subtitles.size(), 1U);
BOOST_CHECK(subtitles[0]->v_align() == reference);
- BOOST_CHECK_CLOSE(subtitles[0]->v_position(), position, 1e-3);
+ BOOST_CHECK_CLOSE(subtitles[0]->v_position(), position, 2);
}
options.reel_annotation_texts_can_differ = true;
options.reel_hashes_can_differ = true;
options.issue_dates_can_differ = true;
+ options.max_subtitle_vertical_position_error = 0.001;
BOOST_CHECK (ref_dcp.equals (check_dcp, options, boost::bind (note, _1, _2)));
}