From 2cada6d249e41e5321b2e6a6766da042d2f5a282 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 7 Jan 2015 10:57:27 +0000 Subject: Pass notes through MonoPictureFrame::rgb_frame(). --- src/mono_picture_frame.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/mono_picture_frame.cc') diff --git a/src/mono_picture_frame.cc b/src/mono_picture_frame.cc index e7dc04ab..617d4687 100644 --- a/src/mono_picture_frame.cc +++ b/src/mono_picture_frame.cc @@ -35,6 +35,7 @@ using std::string; using boost::shared_ptr; +using boost::optional; using namespace dcp; /** Make a picture frame from a JPEG2000 file. @@ -128,11 +129,12 @@ MonoPictureFrame::argb_frame (int reduce, float srgb_gamma) const } void -MonoPictureFrame::rgb_frame (uint16_t* buffer) const +MonoPictureFrame::rgb_frame (uint16_t* buffer, optional note) const { xyz_to_rgb ( decompress_j2k (const_cast (_buffer->RoData()), _buffer->Size(), 0), ColourConversion::xyz_to_srgb (), - buffer + buffer, + note ); } -- cgit v1.2.3