diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-07-10 01:24:48 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-07-10 01:24:48 +0200 |
| commit | 13154bc1a9b341f46994607fdde2e725444a6e21 (patch) | |
| tree | 3fcf211b397092798b2aa39af4cc567d146a574c /src/verify_j2k.cc | |
| parent | 9853cbf566fdfdea096333c4caa788c29fa5c57b (diff) | |
Remove String namespace from around compose().compose
Diffstat (limited to 'src/verify_j2k.cc')
| -rw-r--r-- | src/verify_j2k.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/verify_j2k.cc b/src/verify_j2k.cc index 5317b2f7..ea28596d 100644 --- a/src/verify_j2k.cc +++ b/src/verify_j2k.cc @@ -136,21 +136,21 @@ dcp::verify_j2k (shared_ptr<const Data> j2k, vector<VerificationNote>& notes) auto require_8 = [&](uint8_t value, string note) { auto v = get_8 (); if (v != value) { - throw InvalidCodestream (String::compose(note, v)); + throw InvalidCodestream (compose(note, v)); } }; auto require_16 = [&](uint16_t value, string note) { auto v = get_16 (); if (v != value) { - throw InvalidCodestream (String::compose(note, v)); + throw InvalidCodestream (compose(note, v)); } }; auto require_32 = [&](uint32_t value, string note) { auto v = get_32 (); if (v != value) { - throw InvalidCodestream (String::compose(note, v)); + throw InvalidCodestream (compose(note, v)); } }; @@ -198,7 +198,7 @@ dcp::verify_j2k (shared_ptr<const Data> j2k, vector<VerificationNote>& notes) if (!marker_name) { char buffer[16]; snprintf (buffer, 16, "%2x", marker_id); - throw InvalidCodestream(String::compose("unknown marker %1", buffer)); + throw InvalidCodestream(compose("unknown marker %1", buffer)); } else if (*marker_name == "SOT") { require_16(10, "invalid SOT size %1"); get_16(); // tile index @@ -287,13 +287,13 @@ dcp::verify_j2k (shared_ptr<const Data> j2k, vector<VerificationNote>& notes) auto require_8_poc = [&](uint16_t value, string note) { if (get_8() != value) { - notes.push_back ({ VerificationNote::Type::BV21_ERROR, VerificationNote::Code::INCORRECT_JPEG2000_POC_MARKER, String::compose(note, value) }); + notes.push_back ({ VerificationNote::Type::BV21_ERROR, VerificationNote::Code::INCORRECT_JPEG2000_POC_MARKER, compose(note, value) }); } }; auto require_16_poc = [&](uint16_t value, string note) { if (get_16() != value) { - notes.push_back ({ VerificationNote::Type::BV21_ERROR, VerificationNote::Code::INCORRECT_JPEG2000_POC_MARKER, String::compose(note, value) }); + notes.push_back ({ VerificationNote::Type::BV21_ERROR, VerificationNote::Code::INCORRECT_JPEG2000_POC_MARKER, compose(note, value) }); } }; |