X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fopenjpeg_image.cc;h=c963d2bb9a1cb7308c09872bddd2b56d4c0004f9;hb=refs%2Ftags%2Fv1.8.63;hp=3f5e1dee90e964bd06ef9e0bf3f80f99b5245a97;hpb=f9cba324c8160a70b108d9e5b60a4ccad6ee9be2;p=libdcp.git

diff --git a/src/openjpeg_image.cc b/src/openjpeg_image.cc
index 3f5e1dee..c963d2bb 100644
--- 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.
 
@@ -16,30 +16,92 @@
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 
+    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/openjpeg_image.cc
- *  @brief OpenJPEGImage class.
+ *  @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 */
+
 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.
- */
+
+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];
 
@@ -57,7 +119,7 @@ OpenJPEGImage::OpenJPEGImage (Size size)
 
 	/* XXX: is this _SRGB right? */
 	_opj_image = opj_image_create (3, &cmptparm[0], OPJ_CLRSPC_SRGB);
-	if (_opj_image == 0) {
+	if (_opj_image == nullptr) {
 		throw std::runtime_error ("could not create libopenjpeg image");
 	}
 
@@ -67,15 +129,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
 {
@@ -83,7 +143,7 @@ OpenJPEGImage::data (int c) const
 	return _opj_image->comps[c].data;
 }
 
-/** @return Size of the image in pixels */
+
 dcp::Size
 OpenJPEGImage::size () const
 {
@@ -91,12 +151,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
 {