diff options
| author | Carl Hetherington <cth@carlh.net> | 2026-03-30 13:17:10 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2026-04-01 23:43:00 +0200 |
| commit | b4d9b7fedc37002a97ada284fd3a241a357bd8e2 (patch) | |
| tree | e824a2fd5c14d0050d9640f7abad227097c71ca6 /src | |
| parent | 34eab24abebc4f2b6281c5dba112fe9c872878c4 (diff) | |
INCORRECT_JPEG2000_POC_MARKER: note -> error, poc_marker.
Diffstat (limited to 'src')
| -rw-r--r-- | src/verify.cc | 2 | ||||
| -rw-r--r-- | src/verify.h | 3 | ||||
| -rw-r--r-- | src/verify_j2k.cc | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/verify.cc b/src/verify.cc index 5cb2467b..deb55362 100644 --- a/src/verify.cc +++ b/src/verify.cc @@ -2139,7 +2139,7 @@ dcp::note_to_string(VerificationNote note, function<string (string)> process_str case VerificationNote::Code::INCORRECT_JPEG2000_POC_MARKER_COUNT_FOR_4K: 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()); + return compose("Incorrect POC marker content found (%1).", *note.error()); case VerificationNote::Code::INVALID_JPEG2000_POC_MARKER_LOCATION: return process_string("POC marker found outside main header."); case VerificationNote::Code::INVALID_JPEG2000_TILE_PARTS_FOR_2K: diff --git a/src/verify.h b/src/verify.h index 6ee46635..9783b31b 100644 --- a/src/verify.h +++ b/src/verify.h @@ -434,7 +434,8 @@ public: */ INCORRECT_JPEG2000_POC_MARKER_COUNT_FOR_4K, /** A POC marker has incorrect content [Bv2.1_10.2.1] - * note contains details + * poc_marker contains the invalid marker + * error contains detalis */ INCORRECT_JPEG2000_POC_MARKER, /** A POC marker was found outside the main head [Bv2.1_10.2.1] */ diff --git a/src/verify_j2k.cc b/src/verify_j2k.cc index f070e78b..a2b14854 100644 --- a/src/verify_j2k.cc +++ b/src/verify_j2k.cc @@ -317,13 +317,13 @@ dcp::verify_j2k(shared_ptr<const Data> j2k, int start_index, int frame_index, in auto require_8_poc = [&](uint16_t value, string note) { if (get_8() != value) { - notes.push_back ({ VerificationNote::Code::INCORRECT_JPEG2000_POC_MARKER, String::compose(note, value) }); + notes.push_back(VerificationNote(VerificationNote::Code::INCORRECT_JPEG2000_POC_MARKER).set_poc_marker(value).set_error(note)); } }; auto require_16_poc = [&](uint16_t value, string note) { if (get_16() != value) { - notes.push_back ({ VerificationNote::Code::INCORRECT_JPEG2000_POC_MARKER, String::compose(note, value) }); + notes.push_back (VerificationNote(VerificationNote::Code::INCORRECT_JPEG2000_POC_MARKER).set_poc_marker(value).set_error(note)); } }; |