diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-01-26 21:35:02 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-01-26 21:35:02 +0000 |
| commit | 59886567974bd3e79d30a4a9425d86d50bf425f3 (patch) | |
| tree | 68e583a64144f5cbffede882e1187ecf737b2e43 /src/util.cc | |
| parent | 0703842433013ac1d5f79c09d7a8361dc2e565c8 (diff) | |
It builds again.
Diffstat (limited to 'src/util.cc')
| -rw-r--r-- | src/util.cc | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/util.cc b/src/util.cc index 3807b4cc..fe89ca72 100644 --- a/src/util.cc +++ b/src/util.cc @@ -21,22 +21,6 @@ * @brief Utility methods. */ -#include <stdexcept> -#include <sstream> -#include <iostream> -#include <iomanip> -#include <boost/filesystem.hpp> -#include <boost/lexical_cast.hpp> -#include <openssl/sha.h> -#include <libxml++/nodes/element.h> -#include <libxml++/document.h> -#include <xmlsec/xmldsig.h> -#include <xmlsec/dl.h> -#include <xmlsec/app.h> -#include <xmlsec/crypto.h> -#include "KM_util.h" -#include "KM_fileio.h" -#include "AS_DCP.h" #include "util.h" #include "exceptions.h" #include "types.h" @@ -44,6 +28,22 @@ #include "certificates.h" #include "gamma_lut.h" #include "xyz_frame.h" +#include "KM_util.h" +#include "KM_fileio.h" +#include "AS_DCP.h" +#include <xmlsec/xmldsig.h> +#include <xmlsec/dl.h> +#include <xmlsec/app.h> +#include <xmlsec/crypto.h> +#include <libxml++/nodes/element.h> +#include <libxml++/document.h> +#include <openssl/sha.h> +#include <boost/filesystem.hpp> +#include <boost/lexical_cast.hpp> +#include <stdexcept> +#include <sstream> +#include <iostream> +#include <iomanip> using std::string; using std::wstring; @@ -79,10 +79,10 @@ dcp::make_uuid () * @return Digest. */ string -dcp::make_digest (string filename, boost::function<void (float)>* progress) +dcp::make_digest (boost::filesystem::path filename, boost::function<void (float)>* progress) { Kumu::FileReader reader; - Kumu::Result_t r = reader.OpenRead (filename.c_str ()); + Kumu::Result_t r = reader.OpenRead (filename.string().c_str ()); if (ASDCP_FAILURE (r)) { boost::throw_exception (FileError ("could not open file to compute digest", filename, r)); } |