Tidy up; more/better use of BOOST_FOREACH.

[libdcp.git] / src / util.cc

diff --git a/src/util.cc b/src/util.cc
index 58eacbfbca1cc0b7847db8d85a601652a8dd9131..856bc9bd0001d0d958cbae4334df0824b6cc0a25 100644 (file)
--- a/src/util.cc
+++ b/src/util.cc
@@ -24,13 +24,14 @@
 #include "util.h"
 #include "exceptions.h"
 #include "types.h"
-#include "argb_frame.h"
-#include "certificates.h"
-#include "xyz_frame.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>
@@ -89,7 +90,7 @@ dcp::make_digest (boost::filesystem::path filename, function<void (float)> 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 +102,13 @@ dcp::make_digest (boost::filesystem::path filename, function<void (float)> 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) {
@@ -154,7 +155,7 @@ dcp::content_kind_to_string (ContentKind kind)
                return "advertisement";
        }
 
-       assert (false);
+       DCP_ASSERT (false);
 }
 
 /** Convert a string from a &lt;ContentKind&gt; node to a libdcp ContentKind.
@@ -166,7 +167,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") {
@@ -189,7 +190,7 @@ dcp::content_kind_from_string (string kind)
                return ADVERTISEMENT;
        }
 
-       assert (false);
+       DCP_ASSERT (false);
 }
 
 /** Decompress a JPEG2000 image to a bitmap.
@@ -199,22 +200,48 @@ dcp::content_kind_from_string (string kind)
  *  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.
+ *  @return OpenJPEGImage.
  */
-shared_ptr<dcp::XYZFrame>
+shared_ptr<dcp::OpenJPEGImage>
 dcp::decompress_j2k (uint8_t* data, int64_t size, int reduce)
 {
-       opj_dinfo_t* decoder = opj_create_decompress (CODEC_J2K);
+       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 (&parameters);
        parameters.cp_reduce = reduce;
        opj_setup_decoder (decoder, &parameters);
        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);
-               boost::throw_exception (DCPReadError (String::compose ("could not decode JPEG2000 codestream of %1 bytes.", size)));
+               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);
@@ -222,7 +249,7 @@ dcp::decompress_j2k (uint8_t* data, int64_t size, int reduce)
 
        image->x1 = rint (float(image->x1) / pow (2, reduce));
        image->y1 = rint (float(image->y1) / pow (2, reduce));
-       return shared_ptr<XYZFrame> (new XYZFrame (image));
+       return shared_ptr<OpenJPEGImage> (new OpenJPEGImage (image));
 }
 
 /** @param s A string.
@@ -254,7 +281,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");
@@ -306,7 +333,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);
@@ -375,19 +402,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;
@@ -414,3 +440,16 @@ 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;
+}