X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Futil.cc;h=0c3cea08251e09030b40ffef1ce0910c8a3cf2f3;hb=e4d5298e7a179d4103581cba05cbc516f94acf60;hp=d972d8cec270c212c3143f9289e0482d217e64f5;hpb=885c2ea2aca4d2f5d891ff0954e1fe21fdd16ab4;p=libdcp.git diff --git a/src/util.cc b/src/util.cc index d972d8ce..0c3cea08 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,13 @@ #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 @@ -41,14 +55,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 +68,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 +102,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 +114,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 +179,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,65 +205,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) -{ - uint8_t const jp2_magic[] = { - 0x00, - 0x00, - 0x00, - 0x0c, - 'j', - 'P', - 0x20, - 0x20 - }; - - OPJ_CODEC_FORMAT format = CODEC_J2K; - if (size >= int (sizeof (jp2_magic)) && memcmp (data, jp2_magic, sizeof (jp2_magic)) == 0) { - format = CODEC_JP2; - } - - opj_dinfo_t* decoder = opj_create_decompress (format); - if (!decoder) { - boost::throw_exception (DCPReadError ("could not create JPEG2000 decompresser")); - } - 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); - if (!cio) { - boost::throw_exception (DCPReadError ("could not create JPEG2000 memory stream")); - } - opj_image_t* image = opj_decode (decoder, cio); - if (!image) { - opj_destroy_decompress (decoder); - opj_cio_close (cio); - if (format == CODEC_J2K) { - boost::throw_exception (DCPReadError (String::compose ("could not decode JPEG2000 codestream of %1 bytes.", size))); - } else { - boost::throw_exception (DCPReadError (String::compose ("could not decode JP2 file 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. */ @@ -280,7 +234,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"); @@ -332,7 +286,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); @@ -401,19 +355,18 @@ dcp::file_to_string (boost::filesystem::path p, uintmax_t max_length) if (len > max_length) { throw MiscError ("Unexpectedly long file"); } - - 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; @@ -453,3 +406,10 @@ dcp::find_child (xmlpp::Node const * node, string name) 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); +}