X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Futil.h;h=d7877ac9795ea8ce30d9d25a64c2136cd0061c5c;hb=f3fc81b103c022cf02e2c691e2bfd9e2f6d2a82d;hp=8b72e7e07ec3b9de31d734b9e9429110b485a542;hpb=57b862d997857868d0c3c91a9776f854b62c6b56;p=libdcp.git

diff --git a/src/util.h b/src/util.h
index 8b72e7e0..d7877ac9 100644
--- a/src/util.h
+++ b/src/util.h
@@ -1,20 +1,34 @@
 /*
     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
@@ -25,11 +39,11 @@
  */
 
 #include "types.h"
+#include "data.h"
 #include <boost/shared_ptr.hpp>
 #include <boost/function.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/optional.hpp>
-#include <openjpeg.h>
 #include <string>
 #include <stdint.h>
 
@@ -45,18 +59,13 @@ 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 empty_or_white_space (std::string s);
-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 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);
@@ -65,21 +74,7 @@ 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;
-}
+extern std::string openjpeg_version();
 
 }