diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-01-07 12:12:15 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-01-07 12:12:15 +0000 |
| commit | 77f7f3be256f81d2977bccdb236582e18a625ba7 (patch) | |
| tree | 2b3880043171559a2d6b938c3c1746ba6ea5874c /src/lib/j2k_image_proxy.cc | |
| parent | 48073ddb0a9a6e9c9dd81b04b196230f4372447b (diff) | |
Make a note in the log when XYZ values are clamped by libdcp on XYZ -> RGB conversion.
Diffstat (limited to 'src/lib/j2k_image_proxy.cc')
| -rw-r--r-- | src/lib/j2k_image_proxy.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/j2k_image_proxy.cc b/src/lib/j2k_image_proxy.cc index 20bf70cf1..175f4c796 100644 --- a/src/lib/j2k_image_proxy.cc +++ b/src/lib/j2k_image_proxy.cc @@ -30,6 +30,7 @@ using std::string; using boost::shared_ptr; +using boost::optional; /** Construct a J2KImageProxy from a JPEG2000 file */ J2KImageProxy::J2KImageProxy (boost::filesystem::path path, dcp::Size size) @@ -74,12 +75,12 @@ J2KImageProxy::J2KImageProxy (shared_ptr<cxml::Node> xml, shared_ptr<Socket> soc } shared_ptr<Image> -J2KImageProxy::image () const +J2KImageProxy::image (optional<dcp::NoteHandler> note) const { shared_ptr<Image> image (new Image (PIX_FMT_RGB48LE, _size, false)); if (_mono) { - _mono->rgb_frame (reinterpret_cast<uint16_t*> (image->data()[0])); + _mono->rgb_frame (reinterpret_cast<uint16_t*> (image->data()[0]), note); } else { _stereo->rgb_frame (_eye, reinterpret_cast<uint16_t*> (image->data()[0])); } |