summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2024-08-17 12:55:09 +0200
committerCarl Hetherington <cth@carlh.net>2024-08-17 12:55:09 +0200
commit32f8cc149c8c78c82f9f7e3689e43c11da362968 (patch)
tree012d643e7a6bd1178ea246fea0bb14fd65359e04
parent6f6318e1860d665c1c0c30a9c5735e1355453088 (diff)
parent3970b93b18512d0316be00815a929ae7a45bafce (diff)
Merge remote-tracking branch 'origin/main' into v1.9.xv1.9.14
-rw-r--r--src/verify_j2k.cc1
-rw-r--r--test/verify_test.cc2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/verify_j2k.cc b/src/verify_j2k.cc
index 47ee151c..f89ff840 100644
--- a/src/verify_j2k.cc
+++ b/src/verify_j2k.cc
@@ -217,6 +217,7 @@ dcp::verify_j2k(shared_ptr<const Data> j2k, int start_index, int frame_index, in
if (tile_part_length > max_tile_part_size) {
VerificationNote note{VerificationNote::Type::ERROR, VerificationNote::Code::INVALID_JPEG2000_TILE_PART_SIZE};
note.set_frame(frame_index);
+ note.set_frame_rate(frame_rate);
note.set_component(tile_part_index);
note.set_size(tile_part_length);
notes.push_back(note);
diff --git a/test/verify_test.cc b/test/verify_test.cc
index 3f551790..b5a53ec2 100644
--- a/test/verify_test.cc
+++ b/test/verify_test.cc
@@ -5522,7 +5522,7 @@ BOOST_AUTO_TEST_CASE(verify_invalid_tile_part_size)
expected.push_back(
dcp::VerificationNote(
dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_JPEG2000_TILE_PART_SIZE
- ).set_frame(frame).set_component(component).set_size(component_sizes[component]).set_cpl_id(cpl->id())
+ ).set_frame(frame).set_frame_rate(24).set_component(component).set_size(component_sizes[component]).set_cpl_id(cpl->id())
);
}
}