diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-04-16 23:10:28 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-04-16 23:10:28 +0100 |
| commit | 769c71b5c3e050ccfc1c13771d24328fbf76a495 (patch) | |
| tree | f75d5c5c953884395b2e59358e2c7faff5d5ba4b /src/lib/content.cc | |
| parent | 91bd51ff82e99113860570b519459303802bd98f (diff) | |
Add our own raw_convert that uses SafeStringStream.
Diffstat (limited to 'src/lib/content.cc')
| -rw-r--r-- | src/lib/content.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/content.cc b/src/lib/content.cc index 550a8cd05..fcc658717 100644 --- a/src/lib/content.cc +++ b/src/lib/content.cc @@ -29,8 +29,8 @@ #include "film.h" #include "safe_stringstream.h" #include "job.h" +#include "raw_convert.h" #include <libcxml/cxml.h> -#include <dcp/raw_convert.h> #include <libxml++/libxml++.h> #include <boost/thread/mutex.hpp> @@ -42,7 +42,6 @@ using std::cout; using std::vector; using std::max; using boost::shared_ptr; -using dcp::raw_convert; int const ContentProperty::PATH = 400; int const ContentProperty::POSITION = 401; @@ -145,7 +144,7 @@ Content::examine (shared_ptr<Job> job) digest here: a MD5 of the first and last 1e6 bytes with the size of the first file tacked on the end as a string. */ - string const d = md5_digest_head_tail (p, 1000000) + dcp::raw_convert<string> (boost::filesystem::file_size (p.front ())); + string const d = md5_digest_head_tail (p, 1000000) + raw_convert<string> (boost::filesystem::file_size (p.front ())); lm.lock (); _digest = d; |
