diff options
| author | Carl Hetherington <cth@carlh.net> | 2026-03-30 13:03:04 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2026-04-01 23:43:00 +0200 |
| commit | 34eab24abebc4f2b6281c5dba112fe9c872878c4 (patch) | |
| tree | 85de5090df4ebc8f0c238ccee17bec92b860fffa /src | |
| parent | 8ab777193f5a3d4d201affa8665aa03f94e0bcd8 (diff) | |
INCORRECT_JPEG2000_POC_MARKER_COUNT_FOR_{2,4}K: note -> poc_markers.
Diffstat (limited to 'src')
| -rw-r--r-- | src/verify.cc | 4 | ||||
| -rw-r--r-- | src/verify.h | 4 | ||||
| -rw-r--r-- | src/verify_j2k.cc | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/verify.cc b/src/verify.cc index cf4d91f8..5cb2467b 100644 --- a/src/verify.cc +++ b/src/verify.cc @@ -2135,9 +2135,9 @@ dcp::note_to_string(VerificationNote note, function<string (string)> process_str case VerificationNote::Code::INVALID_JPEG2000_CODE_BLOCK_HEIGHT: return compose("The JPEG2000 codestream uses a code block height of %1 instead of 32.", *note.code_block_height()); case VerificationNote::Code::INCORRECT_JPEG2000_POC_MARKER_COUNT_FOR_2K: - return compose("%1 POC markers found in 2K JPEG2000 codestream instead of 0.", note.note().get()); + return compose("%1 POC markers found in 2K JPEG2000 codestream instead of 0.", *note.poc_markers()); case VerificationNote::Code::INCORRECT_JPEG2000_POC_MARKER_COUNT_FOR_4K: - return compose("%1 POC markers found in 4K JPEG2000 codestream instead of 1.", note.note().get()); + return compose("%1 POC markers found in 4K JPEG2000 codestream instead of 1.", *note.poc_markers()); case VerificationNote::Code::INCORRECT_JPEG2000_POC_MARKER: return compose("Incorrect POC marker content found (%1).", note.note().get()); case VerificationNote::Code::INVALID_JPEG2000_POC_MARKER_LOCATION: diff --git a/src/verify.h b/src/verify.h index aa0780c9..6ee46635 100644 --- a/src/verify.h +++ b/src/verify.h @@ -426,11 +426,11 @@ public: */ INVALID_JPEG2000_CODE_BLOCK_HEIGHT, /** There must be no POC markers in a 2K codestream [Bv2.1_10.2.1] - * note contains the number of POC markers found + * poc_markers contains the number of POC markers found */ INCORRECT_JPEG2000_POC_MARKER_COUNT_FOR_2K, /** There must be exactly one POC marker in a 4K codestream [Bv2.1_10.2.1] - * note contains the number of POC markers found + * poc_markers contains the number of POC markers found */ INCORRECT_JPEG2000_POC_MARKER_COUNT_FOR_4K, /** A POC marker has incorrect content [Bv2.1_10.2.1] diff --git a/src/verify_j2k.cc b/src/verify_j2k.cc index 4458cfa3..f070e78b 100644 --- a/src/verify_j2k.cc +++ b/src/verify_j2k.cc @@ -356,10 +356,10 @@ dcp::verify_j2k(shared_ptr<const Data> j2k, int start_index, int frame_index, in throw InvalidCodestream("more than one QCD marker found"); } if (num_POC_in_main != 0 && !fourk) { - notes.push_back({ VerificationNote::Code::INCORRECT_JPEG2000_POC_MARKER_COUNT_FOR_2K, fmt::to_string(num_POC_in_main) }); + notes.push_back(VerificationNote(VerificationNote::Code::INCORRECT_JPEG2000_POC_MARKER_COUNT_FOR_2K).set_poc_markers(num_POC_in_main)); } if (num_POC_in_main != 1 && fourk) { - notes.push_back({ VerificationNote::Code::INCORRECT_JPEG2000_POC_MARKER_COUNT_FOR_4K, fmt::to_string(num_POC_in_main) }); + notes.push_back(VerificationNote(VerificationNote::Code::INCORRECT_JPEG2000_POC_MARKER_COUNT_FOR_4K).set_poc_markers(num_POC_in_main)); } if (num_POC_after_main != 0) { notes.push_back ({ VerificationNote::Code::INVALID_JPEG2000_POC_MARKER_LOCATION }); |