diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-02-08 16:32:10 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-02-08 16:32:10 +0000 |
| commit | 75300fa4696d4119b4246ec85a95b8d007b73559 (patch) | |
| tree | a0bf328e486cc7c1b160bd4447d531aeb21795d1 /src/lib | |
| parent | 3904df929a551d899fb1abe4ea174173e98b63ad (diff) | |
Actually fix previous.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/j2k_image_proxy.cc | 8 | ||||
| -rw-r--r-- | src/lib/j2k_image_proxy.h | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/lib/j2k_image_proxy.cc b/src/lib/j2k_image_proxy.cc index f1bdac57d..99e4dddab 100644 --- a/src/lib/j2k_image_proxy.cc +++ b/src/lib/j2k_image_proxy.cc @@ -38,7 +38,6 @@ using boost::optional; J2KImageProxy::J2KImageProxy (boost::filesystem::path path, dcp::Size size) : _mono (new dcp::MonoPictureFrame (path)) , _size (size) - , _eye (EYES_BOTH) { } @@ -46,7 +45,6 @@ J2KImageProxy::J2KImageProxy (boost::filesystem::path path, dcp::Size size) J2KImageProxy::J2KImageProxy (shared_ptr<const dcp::MonoPictureFrame> frame, dcp::Size size) : _mono (frame) , _size (size) - , _eye (EYES_BOTH) { } @@ -86,7 +84,7 @@ J2KImageProxy::image (optional<dcp::NoteHandler> note) const if (_mono) { dcp::xyz_to_rgb (_mono->xyz_image (), dcp::ColourConversion::xyz_to_srgb(), image->data()[0], image->stride()[0], note); } else { - dcp::xyz_to_rgb (_stereo->xyz_image (_eye), dcp::ColourConversion::xyz_to_srgb(), image->data()[0], image->stride()[0], note); + dcp::xyz_to_rgb (_stereo->xyz_image (_eye.get ()), dcp::ColourConversion::xyz_to_srgb(), image->data()[0], image->stride()[0], note); } return image; @@ -99,7 +97,7 @@ J2KImageProxy::add_metadata (xmlpp::Node* node) const node->add_child("Width")->add_child_text (dcp::raw_convert<string> (_size.width)); node->add_child("Height")->add_child_text (dcp::raw_convert<string> (_size.height)); if (_stereo) { - node->add_child("Eye")->add_child_text (dcp::raw_convert<string> (_eye)); + node->add_child("Eye")->add_child_text (dcp::raw_convert<string> (_eye.get ())); node->add_child("LeftSize")->add_child_text (dcp::raw_convert<string> (_stereo->left_j2k_size ())); node->add_child("RightSize")->add_child_text (dcp::raw_convert<string> (_stereo->right_j2k_size ())); } else { @@ -124,7 +122,7 @@ J2KImageProxy::j2k () const if (_mono) { return shared_ptr<EncodedData> (new EncodedData (_mono->j2k_data(), _mono->j2k_size())); } else { - if (_eye == dcp::EYE_LEFT) { + if (_eye.get() == dcp::EYE_LEFT) { return shared_ptr<EncodedData> (new EncodedData (_stereo->left_j2k_data(), _stereo->left_j2k_size())); } else { return shared_ptr<EncodedData> (new EncodedData (_stereo->right_j2k_data(), _stereo->right_j2k_size())); diff --git a/src/lib/j2k_image_proxy.h b/src/lib/j2k_image_proxy.h index c2f04e176..67609dfce 100644 --- a/src/lib/j2k_image_proxy.h +++ b/src/lib/j2k_image_proxy.h @@ -43,5 +43,5 @@ private: boost::shared_ptr<const dcp::MonoPictureFrame> _mono; boost::shared_ptr<const dcp::StereoPictureFrame> _stereo; dcp::Size _size; - dcp::Eye _eye; + boost::optional<dcp::Eye> _eye; }; |