diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-11-09 23:43:46 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-11-09 23:43:46 +0100 |
| commit | 59e22e6d9ff4fc180f79df64da2a27f44a982b51 (patch) | |
| tree | 7295986298e99e71d7a79638b8ea1f484c88b383 | |
| parent | 16a6a7a77a14ceaf46c1995dd7b7e0aa6e96887d (diff) | |
Fix off-by-one in verification of closed caption line length.v1.8.5
| -rw-r--r-- | src/verify.cc | 4 | ||||
| -rw-r--r-- | test/verify_test.cc | 16 |
2 files changed, 18 insertions, 2 deletions
diff --git a/src/verify.cc b/src/verify.cc index 16a3b786..a0c329d0 100644 --- a/src/verify.cc +++ b/src/verify.cc @@ -1099,10 +1099,10 @@ verify_text_lines_and_characters ( result->line_count_exceeded = true; } for (auto j: current) { - if (j.second >= warning_length) { + if (j.second > warning_length) { result->warning_length_exceeded = true; } - if (j.second >= error_length) { + if (j.second > error_length) { result->error_length_exceeded = true; } } diff --git a/test/verify_test.cc b/test/verify_test.cc index c8d0e579..dab85a23 100644 --- a/test/verify_test.cc +++ b/test/verify_test.cc @@ -1975,6 +1975,22 @@ BOOST_AUTO_TEST_CASE (verify_valid_closed_caption_line_count4) } +BOOST_AUTO_TEST_CASE (verify_valid_closed_caption_line_length) +{ + auto const dir = path ("build/test/verify_valid_closed_caption_line_length"); + auto cpl = dcp_with_text<dcp::ReelSMPTEClosedCaptionAsset> ( + dir, + { + { 96, 300, 0.0, dcp::VAlign::CENTER, "01234567890123456789012345678901" } + }); + check_verify_result ( + {dir}, + { + { dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_CPL_METADATA, cpl->id(), cpl->file().get() } + }); +} + + BOOST_AUTO_TEST_CASE (verify_invalid_closed_caption_line_length) { auto const dir = path ("build/test/verify_invalid_closed_caption_line_length"); |
