summaryrefslogtreecommitdiff
path: root/src/mono_picture_frame.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-01-07 10:57:27 +0000
committerCarl Hetherington <cth@carlh.net>2015-01-07 10:57:27 +0000
commit2cada6d249e41e5321b2e6a6766da042d2f5a282 (patch)
tree8ac82d1b84eed41ca8e67fb0df530d996d2bab62 /src/mono_picture_frame.cc
parent107482fc19404e20db544e989d880752377fde26 (diff)
Pass notes through MonoPictureFrame::rgb_frame().
Diffstat (limited to 'src/mono_picture_frame.cc')
-rw-r--r--src/mono_picture_frame.cc6
1 files changed, 4 insertions, 2 deletions
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<NoteHandler> note) const
{
xyz_to_rgb (
decompress_j2k (const_cast<uint8_t*> (_buffer->RoData()), _buffer->Size(), 0),
ColourConversion::xyz_to_srgb (),
- buffer
+ buffer,
+ note
);
}