X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Futil.h;h=fab7bd371fdef9fe6371fdbfe68b6b3a94faff64;hb=d5ec30b6d746177e97707085b9e6b709e41ecc20;hp=7056db6a372fe4def5fbe0cce8baa83b4a6a5e0a;hpb=ee7187c25d83a47a106493e66b89888eca6d4344;p=libdcp.git

diff --git a/src/util.h b/src/util.h
index 7056db6a..fab7bd37 100644
--- a/src/util.h
+++ b/src/util.h
@@ -17,40 +17,64 @@
 
 */
 
+#ifndef LIBDCP_UTIL_H
+#define LIBDCP_UTIL_H
+
 /** @file  src/util.h
  *  @brief Utility methods.
  */
 
 #include <string>
 #include <stdint.h>
-#include <boost/signals2.hpp>
+#include <boost/shared_ptr.hpp>
 #include <openjpeg.h>
 #include "types.h"
 
+namespace xmlpp {
+	class Element;
+}
+
 namespace libdcp {
 
-class ARGBFrame;	
-	
-/** Create a UUID.
- *  @return UUID.
- */
-extern std::string make_uuid ();
+class ARGBFrame;
+class CertificateChain;
+class GammaLUT;
+class XYZsRGBLUT;
 
-/** 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);
+struct Size {
+	Size ()
+		: width (0)
+		, height (0)
+	{}
+
+	Size (int w, int h)
+		: width (w)
+		, height (h)
+	{}
+	
+	int width;
+	int height;
+};
+	
+extern bool operator== (Size const & a, Size const & b);
+extern bool operator!= (Size const & a, Size const & b);
 
+extern std::string make_uuid ();
+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);
+extern boost::shared_ptr<ARGBFrame> xyz_to_rgb (opj_image_t* xyz_frame, boost::shared_ptr<const GammaLUT>, boost::shared_ptr<const GammaLUT>);
+
+extern void init ();
+
+extern void sign (xmlpp::Element* parent, CertificateChain const & certificates, std::string const & signer_key);
+extern void add_signature_value (xmlpp::Element* parent, CertificateChain const & certificates, std::string const & signer_key, std::string const & ns);
+extern void add_signer (xmlpp::Element* parent, CertificateChain const & certificates, std::string const & ns);
+
+extern int base64_decode (std::string const & in, unsigned char* out, int out_length);
 
 }
+
+#endif