diff options
| -rw-r--r-- | src/mono_picture_frame.cc | 6 | ||||
| -rw-r--r-- | src/mono_picture_frame.h | 3 |
2 files changed, 6 insertions, 3 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 ); } diff --git a/src/mono_picture_frame.h b/src/mono_picture_frame.h index 50ea0891..bcd7024b 100644 --- a/src/mono_picture_frame.h +++ b/src/mono_picture_frame.h @@ -25,6 +25,7 @@ #include <boost/shared_ptr.hpp> #include <boost/noncopyable.hpp> #include <boost/filesystem.hpp> +#include <boost/optional.hpp> #include <string> #include <stdint.h> @@ -51,7 +52,7 @@ public: ~MonoPictureFrame (); boost::shared_ptr<ARGBFrame> argb_frame (int reduce = 0, float srgb_gamma = 2.4) const; - void rgb_frame (uint16_t* buffer) const; + void rgb_frame (uint16_t* buffer, boost::optional<NoteHandler> note = boost::optional<NoteHandler> ()) const; uint8_t const * j2k_data () const; uint8_t* j2k_data (); int j2k_size () const; |