Tidying.

[libdcp.git] / src / openjpeg_image.cc

diff --git a/src/openjpeg_image.cc b/src/openjpeg_image.cc
index e25c592abbb21a42ec1728d77cdfc263d98b2774..3594b2bde540e1579510cae18717e20ec21a4043 100644 (file)
--- a/src/openjpeg_image.cc
+++ b/src/openjpeg_image.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -31,28 +31,88 @@
     files in the program, then also delete it here.
 */
 
+
 /** @file  src/openjpeg_image.cc
  *  @brief OpenJPEGImage class.
  */
 
+
 #include "openjpeg_image.h"
 #include "dcp_assert.h"
 #include <openjpeg.h>
 #include <stdexcept>
 
+
 using namespace dcp;
 
-/** Construct an OpenJPEGImage, taking ownership of the opj_image_t */
+
+#ifdef LIBDCP_OPENJPEG1
+#define OPJ_CLRSPC_SRGB CLRSPC_SRGB
+#endif
+
+
 OpenJPEGImage::OpenJPEGImage (opj_image_t* image)
        : _opj_image (image)
 {
        DCP_ASSERT (_opj_image->numcomps == 3);
 }
 
-/** Construct a new OpenJPEGImage with undefined contents.
- *  @param size Size for the frame in pixels.
- */
+
+#ifdef LIBDCP_OPENJPEG1
+typedef int32_t OPJ_INT32;
+typedef uint8_t OPJ_BYTE;
+#endif
+
+
+OpenJPEGImage::OpenJPEGImage (OpenJPEGImage const & other)
+{
+       _opj_image = reinterpret_cast<opj_image_t*>(malloc(sizeof(opj_image_t)));
+       DCP_ASSERT (_opj_image);
+       memcpy (_opj_image, other._opj_image, sizeof (opj_image_t));
+
+       int const data_size = _opj_image->x1 * _opj_image->y1 * 4;
+
+       _opj_image->comps = reinterpret_cast<opj_image_comp_t*> (malloc (_opj_image->numcomps * sizeof (opj_image_comp_t)));
+       DCP_ASSERT (_opj_image->comps);
+       memcpy (_opj_image->comps, other._opj_image->comps, _opj_image->numcomps * sizeof (opj_image_comp_t));
+       for (unsigned int i = 0; i < _opj_image->numcomps; ++i) {
+               _opj_image->comps[i].data = reinterpret_cast<OPJ_INT32*> (malloc (data_size));
+               DCP_ASSERT (_opj_image->comps[i].data);
+               memcpy (_opj_image->comps[i].data, other._opj_image->comps[i].data, data_size);
+       }
+
+       _opj_image->icc_profile_buf = reinterpret_cast<OPJ_BYTE*> (malloc (_opj_image->icc_profile_len));
+       DCP_ASSERT (_opj_image->icc_profile_buf);
+       memcpy (_opj_image->icc_profile_buf, other._opj_image->icc_profile_buf, _opj_image->icc_profile_len);
+}
+
+
 OpenJPEGImage::OpenJPEGImage (Size size)
+{
+       create (size);
+}
+
+
+OpenJPEGImage::OpenJPEGImage (uint8_t const * data_16, dcp::Size size, int stride)
+{
+       create (size);
+
+       int jn = 0;
+       for (int y = 0; y < size.height; ++y) {
+               uint16_t const * p = reinterpret_cast<uint16_t const *> (data_16 + y * stride);
+               for (int x = 0; x < size.width; ++x) {
+                       /* Truncate 16-bit to 12-bit */
+                       _opj_image->comps[0].data[jn] = *p++ >> 4;
+                       _opj_image->comps[1].data[jn] = *p++ >> 4;
+                       _opj_image->comps[2].data[jn] = *p++ >> 4;
+                       ++jn;
+               }
+       }
+}
+
+
+void
+OpenJPEGImage::create (Size size)
 {
        opj_image_cmptparm_t cmptparm[3];
 
@@ -80,15 +140,13 @@ OpenJPEGImage::OpenJPEGImage (Size size)
        _opj_image->y1 = size.height;
 }
 
-/** OpenJPEGImage destructor */
+
 OpenJPEGImage::~OpenJPEGImage ()
 {
        opj_image_destroy (_opj_image);
 }
 
-/** @param c Component index (0, 1 or 2)
- *  @return Pointer to the data for component c.
- */
+
 int *
 OpenJPEGImage::data (int c) const
 {
@@ -96,7 +154,7 @@ OpenJPEGImage::data (int c) const
        return _opj_image->comps[c].data;
 }
 
-/** @return Size of the image in pixels */
+
 dcp::Size
 OpenJPEGImage::size () const
 {
@@ -104,12 +162,21 @@ OpenJPEGImage::size () const
        return dcp::Size (_opj_image->x1, _opj_image->y1);
 }
 
+
 int
 OpenJPEGImage::precision (int component) const
 {
        return _opj_image->comps[component].prec;
 }
 
+
+int
+OpenJPEGImage::factor (int component) const
+{
+       return _opj_image->comps[component].factor;
+}
+
+
 bool
 OpenJPEGImage::srgb () const
 {