From 9b6997ac39d8bc728f8acad8b99448e3c03b5e14 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sun, 14 Feb 2021 20:55:37 +0100
Subject: Some const correctness for decompress_j2k

---
 src/j2k_transcode.cc | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'src/j2k_transcode.cc')

diff --git a/src/j2k_transcode.cc b/src/j2k_transcode.cc
index dafe8fdf..9b7210aa 100644
--- a/src/j2k_transcode.cc
+++ b/src/j2k_transcode.cc
@@ -57,18 +57,25 @@ using namespace dcp;
 
 
 shared_ptr<dcp::OpenJPEGImage>
-dcp::decompress_j2k (ArrayData data, int reduce)
+dcp::decompress_j2k (Data const& data, int reduce)
 {
 	return dcp::decompress_j2k (data.data(), data.size(), reduce);
 }
 
 
+shared_ptr<dcp::OpenJPEGImage>
+dcp::decompress_j2k (shared_ptr<const Data> data, int reduce)
+{
+	return dcp::decompress_j2k (data->data(), data->size(), reduce);
+}
+
+
 #ifdef LIBDCP_OPENJPEG2
 
 class ReadBuffer
 {
 public:
-	ReadBuffer (uint8_t* data, int64_t size)
+	ReadBuffer (uint8_t const * data, int64_t size)
 		: _data (data)
 		, _size (size)
 		, _offset (0)
@@ -83,7 +90,7 @@ public:
 	}
 
 private:
-	uint8_t* _data;
+	uint8_t const * _data;
 	OPJ_SIZE_T _size;
 	OPJ_SIZE_T _offset;
 };
@@ -118,7 +125,7 @@ compress_error_callback (char const * msg, void *)
 
 
 shared_ptr<dcp::OpenJPEGImage>
-dcp::decompress_j2k (uint8_t* data, int64_t size, int reduce)
+dcp::decompress_j2k (uint8_t const * data, int64_t size, int reduce)
 {
 	DCP_ASSERT (reduce >= 0);
 
-- 
cgit v1.2.3