From 4b2b565a03f26c399960416efeed300dd80e401b Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 21 Sep 2020 00:53:55 +0200 Subject: Adapt for changes in parent branch, and test churn. --- src/combine.cc | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'src/combine.cc') diff --git a/src/combine.cc b/src/combine.cc index 0e262fce..65cd3d0b 100644 --- a/src/combine.cc +++ b/src/combine.cc @@ -94,7 +94,15 @@ create_hard_link_or_copy (boost::filesystem::path from, boost::filesystem::path void -dcp::combine (vector inputs, boost::filesystem::path output, shared_ptr signer) +dcp::combine ( + vector inputs, + boost::filesystem::path output, + string issuer, + string creator, + string issue_date, + string annotation_text, + shared_ptr signer + ) { using namespace boost::filesystem; @@ -161,5 +169,5 @@ dcp::combine (vector inputs, boost::filesystem::path ou } output_dcp.resolve_refs (assets); - output_dcp.write_xml (*standard, dcp::XMLMetadata(), signer); + output_dcp.write_xml (*standard, issuer, creator, issue_date, annotation_text, signer); } -- cgit v1.2.3