summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2020-12-12 20:33:15 +0100
committerCarl Hetherington <cth@carlh.net>2021-01-17 20:13:22 +0100
commitab9d9fe2f33bf5fadb0132120111e0e73c86ca09 (patch)
tree0cf431c3a4ce79d4c2a4ef96ef6fd9de2ae10344 /src
parent621b82e1a5dfeb34602f336d645c670618d6db7e (diff)
Bv2.1 6.2.1: Check that release territory conforms to RFC 5646.
Diffstat (limited to 'src')
-rw-r--r--src/cpl.h4
-rw-r--r--src/verify.cc4
2 files changed, 6 insertions, 2 deletions
diff --git a/src/cpl.h b/src/cpl.h
index 8d7c76e4..6805cc89 100644
--- a/src/cpl.h
+++ b/src/cpl.h
@@ -54,7 +54,7 @@
#include <vector>
-struct verify_invalid_sound_reel_and_additional_language;
+struct verify_various_invalid_languages;
namespace dcp {
@@ -283,7 +283,7 @@ protected:
std::string pkl_type (Standard standard) const;
private:
- friend struct ::verify_invalid_sound_reel_and_additional_language;
+ friend struct ::verify_various_invalid_languages;
void maybe_write_composition_metadata_asset (xmlpp::Element* node) const;
void read_composition_metadata_asset (cxml::ConstNodePtr node);
diff --git a/src/verify.cc b/src/verify.cc
index 16233021..363264db 100644
--- a/src/verify.cc
+++ b/src/verify.cc
@@ -647,6 +647,10 @@ dcp::verify (
verify_language_tag (i, notes);
}
+ if (cpl->release_territory()) {
+ verify_language_tag (cpl->release_territory().get(), notes);
+ }
+
/* Check that the CPL's hash corresponds to the PKL */
BOOST_FOREACH (shared_ptr<PKL> i, dcp->pkls()) {
optional<string> h = i->hash(cpl->id());