#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 <openjpeg.h>
#include <xmlsec/xmldsig.h>
#include <xmlsec/dl.h>
#include <xmlsec/app.h>
using std::setfill;
using std::ostream;
using boost::shared_ptr;
+using boost::shared_array;
using boost::optional;
using boost::function;
using boost::algorithm::trim;
if (ASDCP_FAILURE (r)) {
boost::throw_exception (FileError ("could not open file to compute digest", filename, r));
}
-
+
SHA_CTX sha;
SHA1_Init (&sha);
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) {
dcp::content_kind_from_string (string kind)
{
transform (kind.begin(), kind.end(), kind.begin(), ::tolower);
-
+
if (kind == "feature") {
return FEATURE;
} else if (kind == "short") {
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::XYZImage>
-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<XYZImage> (new XYZImage (image));
-}
-
/** @param s A string.
* @return true if the string contains only space, newline or tab characters, or is empty.
*/
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");
*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);
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;