Assorted test fixes.

[libdcp.git] / src / util.h

diff --git a/src/util.h b/src/util.h
index 8db838ebc7c2adbfc6269f47be87bd193ad18bc4..d3f212c7531fbd51785e1856e40eaa309a5dfc96 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -27,7 +27,6 @@
 #include "types.h"
 #include <boost/shared_ptr.hpp>
 #include <boost/function.hpp>
-#include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/optional.hpp>
 #include <openjpeg.h>
@@ -45,6 +44,9 @@ class CertificateChain;
 class GammaLUT;
 class XYZFrame;
 
+/** @struct Size
+ *  @brief The integer, two-dimensional size of something.
+ */
 struct Size
 {
        Size ()
@@ -67,13 +69,15 @@ struct Size
        
 extern bool operator== (Size const & a, Size const & b);
 extern bool operator!= (Size const & a, Size const & b);
+extern std::ostream& operator<< (std::ostream& s, Size const & a);
 
 extern std::string make_uuid ();
-extern std::string make_digest (boost::filesystem::path filename, boost::function<void (float)> *);
+extern std::string make_digest (boost::filesystem::path filename, boost::function<void (float)>);
 extern std::string content_kind_to_string (ContentKind kind);
 extern ContentKind content_kind_from_string (std::string kind);
 extern bool empty_or_white_space (std::string s);
 extern boost::shared_ptr<XYZFrame> decompress_j2k (uint8_t* data, int64_t size, int reduce);
+extern bool ids_equal (std::string a, std::string b);
 
 extern void init ();
 
@@ -83,9 +87,6 @@ extern void add_signer (xmlpp::Element* parent, CertificateChain const & certifi
 
 extern int base64_decode (std::string const & in, unsigned char* out, int out_length);
 extern boost::optional<boost::filesystem::path> relative_to_root (boost::filesystem::path root, boost::filesystem::path file);
-extern std::string tm_to_string (struct tm *);
-extern std::string utc_offset_to_string (int);
-extern std::string ptime_to_string (boost::posix_time::ptime);
 extern FILE * fopen_boost (boost::filesystem::path, std::string);
 
 template <class F, class T>