X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Futil.h;h=a14d7364bbfbef381bf9b1e49cd05236534e22b1;hb=08db8ff8a9875fe98acfd4746af293dfcc1087c2;hp=2f661d772b3457514c80da6416aaf69ca43d18da;hpb=573d38b0d1122597a73be47401e8b908429b9fe4;p=libdcp.git

diff --git a/src/util.h b/src/util.h
index 2f661d77..a14d7364 100644
--- a/src/util.h
+++ b/src/util.h
@@ -1,20 +1,34 @@
 /*
-    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/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
+
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
 #ifndef LIBDCP_UTIL_H
@@ -24,67 +38,65 @@
  *  @brief Utility methods.
  */
 
-#include <string>
-#include <stdint.h>
+#include "types.h"
+#include "data.h"
+#include "local_time.h"
+#include <asdcp/KM_log.h>
 #include <boost/shared_ptr.hpp>
 #include <boost/function.hpp>
-#include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/filesystem.hpp>
-#include <openjpeg.h>
-#include "types.h"
+#include <boost/optional.hpp>
+#include <string>
+#include <stdint.h>
+
+#define LIBDCP_UNUSED(x) (void)(x)
 
 namespace xmlpp {
 	class Element;
+	class Node;
 }
 
-namespace libdcp {
+namespace dcp {
 
-class ARGBFrame;
 class CertificateChain;
 class GammaLUT;
-class XYZFrame;
-
-struct Size {
-	Size ()
-		: width (0)
-		, height (0)
-	{}
-
-	Size (int w, int h)
-		: width (w)
-		, height (h)
-	{}
-
-	float ratio () const {
-		return float (width) / height;
-	}
-	
-	int width;
-	int height;
-};
-	
-extern bool operator== (Size const & a, Size const & b);
-extern bool operator!= (Size const & a, Size const & b);
+class OpenJPEGImage;
 
 extern std::string make_uuid ();
-extern std::string make_digest (std::string filename, boost::function<void (float)> *);
-extern std::string content_kind_to_string (ContentKind kind);
-extern ContentKind content_kind_from_string (std::string kind);
+extern std::string make_digest (boost::filesystem::path filename, boost::function<void (float)>);
+extern std::string make_digest (Data data);
 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 std::string remove_urn_uuid (std::string raw);
 extern void init ();
 
-extern void sign (xmlpp::Element* parent, CertificateChain const & certificates, boost::filesystem::path signer_key, bool interop);
-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 = 1048576);
+extern std::string private_key_fingerprint (std::string key);
+extern xmlpp::Node* find_child (xmlpp::Node const * node, std::string name);
+extern std::string openjpeg_version();
+extern std::string spaces (int n);
+extern void indent (xmlpp::Element* element, int initial);
+extern bool day_less_than_or_equal (LocalTime a, LocalTime b);
+extern bool day_greater_than_or_equal (LocalTime a, LocalTime b);
+extern std::string unique_string (std::list<std::string> existing, std::string base);
+
+
+class ASDCPErrorSuspender
+{
+public:
+	ASDCPErrorSuspender();
+	~ASDCPErrorSuspender();
+
+private:
+	Kumu::LogEntryList _log;
+	Kumu::ILogSink& _old;
+	Kumu::EntryListLogSink* _sink;
+};
+
 
-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);
-	
 }
 
 #endif