X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Futil.cc;h=ac2246c30f851c0abb99146180e43eb6f9eb6a77;hb=72bb29fad754774e78f2901d7db39f7d73def010;hp=044801b79ba6376dd1a723f50c4b18b59eee81e4;hpb=989f182558193a51e0a26603fb2ca59f827216a0;p=libdcp.git diff --git a/src/util.cc b/src/util.cc index 044801b7..ac2246c3 100644 --- a/src/util.cc +++ b/src/util.cc @@ -1,20 +1,34 @@ /* Copyright (C) 2012-2014 Carl Hetherington - 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 . + + 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. */ /** @file src/util.cc @@ -24,13 +38,14 @@ #include "util.h" #include "exceptions.h" #include "types.h" -#include "certificates.h" -#include "xyz_image.h" +#include "certificate.h" +#include "openjpeg_image.h" #include "dcp_assert.h" #include "compose.hpp" -#include "KM_util.h" -#include "KM_fileio.h" -#include "AS_DCP.h" +#include +#include +#include +#include #include #include #include @@ -41,14 +56,12 @@ #include #include #include -#include #include #include using std::string; using std::wstring; using std::cout; -using std::stringstream; using std::min; using std::max; using std::list; @@ -56,6 +69,7 @@ using std::setw; using std::setfill; using std::ostream; using boost::shared_ptr; +using boost::shared_array; using boost::optional; using boost::function; using boost::algorithm::trim; @@ -89,7 +103,7 @@ dcp::make_digest (boost::filesystem::path filename, function progr if (ASDCP_FAILURE (r)) { boost::throw_exception (FileError ("could not open file to compute digest", filename, r)); } - + SHA_CTX sha; SHA1_Init (&sha); @@ -101,13 +115,13 @@ dcp::make_digest (boost::filesystem::path filename, function progr while (1) { ui32_t read = 0; Kumu::Result_t r = reader.Read (read_buffer.Data(), read_buffer.Capacity(), &read); - + if (r == Kumu::RESULT_ENDOFFILE) { break; } else if (ASDCP_FAILURE (r)) { boost::throw_exception (FileError ("could not read file to compute digest", filename, r)); } - + SHA1_Update (&sha, read_buffer.Data(), read); if (progress) { @@ -166,7 +180,7 @@ dcp::ContentKind dcp::content_kind_from_string (string kind) { transform (kind.begin(), kind.end(), kind.begin(), ::tolower); - + if (kind == "feature") { return FEATURE; } else if (kind == "short") { @@ -192,39 +206,6 @@ dcp::content_kind_from_string (string kind) DCP_ASSERT (false); } -/** Decompress a JPEG2000 image to a bitmap. - * @param data JPEG2000 data. - * @param size Size of data in bytes. - * @param reduce A power of 2 by which to reduce the size of the decoded image; - * e.g. 0 reduces by (2^0 == 1), ie keeping the same size. - * 1 reduces by (2^1 == 2), ie halving the size of the image. - * This is useful for scaling 4K DCP images down to 2K. - * @return XYZ image. - */ -shared_ptr -dcp::decompress_j2k (uint8_t* data, int64_t size, int reduce) -{ - opj_dinfo_t* decoder = opj_create_decompress (CODEC_J2K); - opj_dparameters_t parameters; - opj_set_default_decoder_parameters (¶meters); - parameters.cp_reduce = reduce; - opj_setup_decoder (decoder, ¶meters); - opj_cio_t* cio = opj_cio_open ((opj_common_ptr) decoder, data, size); - opj_image_t* image = opj_decode (decoder, cio); - if (!image) { - opj_destroy_decompress (decoder); - opj_cio_close (cio); - boost::throw_exception (DCPReadError (String::compose ("could not decode JPEG2000 codestream of %1 bytes.", size))); - } - - opj_destroy_decompress (decoder); - opj_cio_close (cio); - - image->x1 = rint (float(image->x1) / pow (2, reduce)); - image->y1 = rint (float(image->y1) / pow (2, reduce)); - return shared_ptr (new XYZImage (image)); -} - /** @param s A string. * @return true if the string contains only space, newline or tab characters, or is empty. */ @@ -254,7 +235,7 @@ dcp::init () if (xmlSecCryptoDLLoadLibrary(BAD_CAST XMLSEC_CRYPTO) < 0) { throw MiscError ("unable to load default xmlsec-crypto library"); } -#endif +#endif if (xmlSecCryptoAppInit(0) < 0) { throw MiscError ("could not initialise crypto"); @@ -263,22 +244,8 @@ dcp::init () if (xmlSecCryptoInit() < 0) { throw MiscError ("could not initialise xmlsec-crypto"); } -} -bool dcp::operator== (dcp::Size const & a, dcp::Size const & b) -{ - return (a.width == b.width && a.height == b.height); -} - -bool dcp::operator!= (dcp::Size const & a, dcp::Size const & b) -{ - return !(a == b); -} - -ostream& dcp::operator<< (ostream& s, dcp::Size const & a) -{ - s << a.width << "x" << a.height; - return s; + OpenSSL_add_all_algorithms(); } /** Decode a base64 string. The base64 decode routine in KM_util.cpp @@ -306,7 +273,7 @@ dcp::base64_decode (string const & in, unsigned char* out, int out_length) *p++ = in[i]; } } - + BIO* bmem = BIO_new_mem_buf (in_buffer, p - in_buffer); bmem = BIO_push (b64, bmem); int const N = BIO_read (bmem, out, out_length); @@ -373,21 +340,20 @@ dcp::file_to_string (boost::filesystem::path p, uintmax_t max_length) { uintmax_t len = boost::filesystem::file_size (p); if (len > max_length) { - throw MiscError ("Unexpectedly long file"); + throw MiscError (String::compose ("Unexpectedly long file (%1)", p.string())); } - - char* c = new char[len + 1]; - + FILE* f = fopen_boost (p, "r"); if (!f) { - return ""; + throw FileError ("could not open file", p, errno); } - fread (c, 1, len, f); + char* c = new char[len]; + /* This may read less than `len' if we are on Windows and we have CRLF in the file */ + int const N = fread (c, 1, len, f); fclose (f); - c[len] = '\0'; - string s (c); + string s (c, N); delete[] c; return s; @@ -414,3 +380,29 @@ dcp::private_key_fingerprint (string key) char digest_base64[64]; return Kumu::base64encode (digest, 20, digest_base64, 64); } + +xmlpp::Node * +dcp::find_child (xmlpp::Node const * node, string name) +{ + xmlpp::Node::NodeList c = node->get_children (); + xmlpp::Node::NodeList::iterator i = c.begin(); + while (i != c.end() && (*i)->get_name() != name) { + ++i; + } + + DCP_ASSERT (i != c.end ()); + return *i; +} + +string +dcp::remove_urn_uuid (string raw) +{ + DCP_ASSERT (raw.substr(0, 9) == "urn:uuid:"); + return raw.substr (9); +} + +string +dcp::openjpeg_version () +{ + return opj_version (); +}