diff options
| author | Carl Hetherington <cth@carlh.net> | 2025-03-30 16:01:17 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2025-12-15 17:13:38 +0100 |
| commit | 2086b96280aad39b4b16422025a3f4a9577b3105 (patch) | |
| tree | 15ad8daffc83460b0bae0ebeb1281146ffaa49e0 /src | |
| parent | 2c67ca9bd91dbb96ff489e5303f61c7c6d852e3f (diff) | |
Use xml_namespace for INVALID_CPL_NAMESPACE.
Diffstat (limited to 'src')
| -rw-r--r-- | src/cpl.cc | 3 | ||||
| -rw-r--r-- | src/verify.cc | 5 | ||||
| -rw-r--r-- | src/verify.h | 2 |
3 files changed, 5 insertions, 5 deletions
@@ -123,9 +123,8 @@ CPL::CPL(boost::filesystem::path file, vector<dcp::VerificationNote>* notes) dcp::VerificationNote( dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_CPL_NAMESPACE, - f.namespace_uri(), file - ) + ).set_xml_namespace(f.namespace_uri()) ); } _standard = Standard::INTEROP; diff --git a/src/verify.cc b/src/verify.cc index 28b7d0d4..b7fff65e 100644 --- a/src/verify.cc +++ b/src/verify.cc @@ -2210,7 +2210,7 @@ dcp::note_to_string(VerificationNote note, function<string (string)> process_str case VerificationNote::Code::VALID_CONTENT_VERSION_LABEL_TEXT: return compose("CPL has valid <ContentVersion> %1", note.note().get()); case VerificationNote::Code::INVALID_CPL_NAMESPACE: - return compose("The namespace %1 in CPL %2 is invalid", note.note().get(), note.cpl_id().get()); + return compose("The namespace %1 in CPL %2 is invalid", note.xml_namespace().get(), note.cpl_id().get()); case VerificationNote::Code::MISSING_CPL_CONTENT_VERSION: return compose("The CPL %1 has no <ContentVersion> tag", note.cpl_id().get()); case VerificationNote::Code::INVALID_PKL_NAMESPACE: @@ -2240,7 +2240,8 @@ dcp::operator== (dcp::VerificationNote const& a, dcp::VerificationNote const& b) a.cpl_id() == b.cpl_id() && a.reference_hash() == b.reference_hash() && a.calculated_hash() == b.calculated_hash() && - a.reel_index() == b.reel_index(); + a.reel_index() == b.reel_index() && + a.xml_namespace() == b.xml_namespace(); } diff --git a/src/verify.h b/src/verify.h index e4f1e0bb..840cf0ae 100644 --- a/src/verify.h +++ b/src/verify.h @@ -541,7 +541,7 @@ public: /** A <LabelText> inside a _<ContentVersion>_ is valid */ VALID_CONTENT_VERSION_LABEL_TEXT, /** The CPL namespace is not valid. - * note contains the invalid namespace + * namespace contains the invalid namespace * file contains the CPL filename */ INVALID_CPL_NAMESPACE, |