X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Futil.h;h=97ef2c55cd0c12780089abbda82747c9e4ce48da;hb=2ae92dcc97765deb2845dd07a338858aeb375cb3;hp=f568597023f238c34444a92b2c4c526103b9791f;hpb=c289685296d58228df0a88354e966105b242c915;p=libdcp.git

diff --git a/src/util.h b/src/util.h
index f5685970..97ef2c55 100644
--- a/src/util.h
+++ b/src/util.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -24,41 +24,66 @@
  *  @brief Utility methods.
  */
 
-#include <string>
-#include <stdint.h>
+#include "types.h"
 #include <boost/shared_ptr.hpp>
+#include <boost/function.hpp>
+#include <boost/filesystem.hpp>
+#include <boost/optional.hpp>
 #include <openjpeg.h>
-#include "types.h"
+#include <string>
+#include <stdint.h>
+
+namespace xmlpp {
+	class Element;
+	class Node;
+}
+
+namespace dcp {
+
+class ARGBImage;
+class CertificateChain;
+class GammaLUT;
+class OpenJPEGImage;
 
-namespace libdcp {
-
-class ARGBFrame;
-
-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::ostream& operator<< (std::ostream& s, Size const & a);
 
 extern std::string make_uuid ();
-extern std::string make_digest (std::string filename);
+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 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<OpenJPEGImage> decompress_j2k (uint8_t* data, int64_t size, int reduce);
+extern bool ids_equal (std::string a, std::string b);
+
+extern void init ();
+
+extern void sign (xmlpp::Element* parent, CertificateChain const & certificates, boost::filesystem::path signer_key, Standard standard);
+extern void add_signature_value (xmlpp::Element* parent, CertificateChain const & certificates, boost::filesystem::path 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);
+extern boost::optional<boost::filesystem::path> relative_to_root (boost::filesystem::path root, boost::filesystem::path file);
+extern FILE * fopen_boost (boost::filesystem::path, std::string);
+extern std::string file_to_string (boost::filesystem::path, uintmax_t max_length = 65536);
+extern std::string private_key_fingerprint (std::string key);
+extern xmlpp::Node* find_child (xmlpp::Node const * node, std::string name);
+
+template <class F, class T>
+std::list<boost::shared_ptr<T> >
+list_of_type (std::list<boost::shared_ptr<F> > const & from)
+{
+	std::list<boost::shared_ptr<T> > out;
+	for (typename std::list<boost::shared_ptr<F> >::const_iterator i = from.begin(); i != from.end(); ++i) {
+		boost::shared_ptr<T> check = boost::dynamic_pointer_cast<T> (*i);
+		if (check) {
+			out.push_back (check);
+		}
+	}
+
+	return out;
+}
 
 }