summaryrefslogtreecommitdiff
path: root/src/util.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-01-14 20:15:43 +0000
committerCarl Hetherington <cth@carlh.net>2013-01-14 20:15:43 +0000
commited6a471b61d36a3ba7e8696fa3e5606406c5cf62 (patch)
tree3ca098925eb269c4cd41ff22124773ba7d36c14b /src/util.h
parent67cf9c95d190b1f2a67d73c0a7f712e213b6e71a (diff)
parent62ee85a258aa9329544d8542dfbcc40ce8177a7a (diff)
Merge master
Diffstat (limited to 'src/util.h')
-rw-r--r--src/util.h17
1 files changed, 1 insertions, 16 deletions
diff --git a/src/util.h b/src/util.h
index 3b60e0c7..ddc5a322 100644
--- a/src/util.h
+++ b/src/util.h
@@ -23,7 +23,6 @@
#include <string>
#include <stdint.h>
-#include <boost/signals2.hpp>
#include <openjpeg.h>
#include "types.h"
@@ -36,25 +35,11 @@ namespace libdcp {
class ARGBFrame;
class CertificateChain;
-/** Create a UUID.
- * @return UUID.
- */
extern std::string make_uuid ();
-
-/** Create a digest for a file.
- * @param filename File name.
- * @param progress If non-0, a signal which will be emitted periodically to update
- * progress; the parameter will start at 0.5 and proceed to 1.
- * @return Digest.
- */
-extern std::string make_digest (std::string filename, boost::signals2::signal<void (float)>* progress);
-
+extern std::string make_digest (std::string filename);
extern std::string content_kind_to_string (ContentKind kind);
extern ContentKind content_kind_from_string (std::string kind);
-extern bool starts_with (std::string big, std::string little);
-extern bool ends_with (std::string big, std::string little);
extern bool empty_or_white_space (std::string s);
-
extern opj_image_t* decompress_j2k (uint8_t* data, int64_t size, int reduce);
extern boost::shared_ptr<ARGBFrame> xyz_to_rgb (opj_image_t* xyz_frame);