summaryrefslogtreecommitdiff
path: root/src/j2k.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-11-29 23:45:59 +0000
committerCarl Hetherington <cth@carlh.net>2015-12-04 21:12:46 +0000
commitd4a2e054dee6ee80b578500e47f4eaf84731f140 (patch)
treebcbf36b8e6b64800e01dd3cd0b440e1cf1a52bf8 /src/j2k.cc
parent660f1059c3b2c1ee08cd390cf6d5a0b5900a7edc (diff)
Take DCP-o-matic's version of Data class.
Diffstat (limited to 'src/j2k.cc')
-rw-r--r--src/j2k.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/j2k.cc b/src/j2k.cc
index 5318f0c2..c5502ec3 100644
--- a/src/j2k.cc
+++ b/src/j2k.cc
@@ -35,7 +35,7 @@ using namespace dcp;
shared_ptr<dcp::OpenJPEGImage>
dcp::decompress_j2k (Data data, int reduce)
{
- return dcp::decompress_j2k (data.data.get(), data.size, reduce);
+ return dcp::decompress_j2k (data.data().get(), data.size(), reduce);
}
class ReadBuffer
@@ -153,7 +153,7 @@ public:
OPJ_SIZE_T write (void* buffer, OPJ_SIZE_T nb_bytes)
{
DCP_ASSERT ((_offset + nb_bytes) < MAX_J2K_SIZE);
- memcpy (_data.data.get() + _offset, buffer, nb_bytes);
+ memcpy (_data.data().get() + _offset, buffer, nb_bytes);
_offset += nb_bytes;
return nb_bytes;
}