More licence fixups.

[libdcp.git] / src / util.h

diff --git a/src/util.h b/src/util.h
index ac13e9f6120e88b69019428666e88816bb9f54e0..52cbe635a94d10f545db7dd49082d717e2783c5b 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -1,47 +1,70 @@
 /*
-    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
+    This file is part of libdcp.
+
+    libdcp is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef LIBDCP_UTIL_H
+#define LIBDCP_UTIL_H
+
 /** @file  src/util.h
  *  @brief Utility methods.
  */
 
-#include <string>
-#include <sigc++/sigc++.h>
 #include "types.h"
+#include "data.h"
+#include <boost/shared_ptr.hpp>
+#include <boost/function.hpp>
+#include <boost/filesystem.hpp>
+#include <boost/optional.hpp>
+#include <string>
+#include <stdint.h>
 
-namespace libdcp {
+namespace xmlpp {
+       class Element;
+       class Node;
+}
 
-/** Create a UUID.
- *  @return UUID.
- */
-extern std::string make_uuid ();
+namespace dcp {
 
-/** 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, sigc::signal1<void, float>* progress);
+class ARGBImage;
+class CertificateChain;
+class GammaLUT;
+class OpenJPEGImage;
 
+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 content_kind_to_string (ContentKind kind);
 extern ContentKind content_kind_from_string (std::string kind);
-extern bool ends_with (std::string big, std::string little);
-       
+extern bool empty_or_white_space (std::string s);
+extern bool ids_equal (std::string a, std::string b);
+extern std::string remove_urn_uuid (std::string raw);
+extern void init ();
+
+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);
+
 }
+
+#endif