diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-04-24 12:05:21 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-04-24 12:05:21 +0100 |
| commit | 1cdedd1c19bd34f1c41043f9bbeae39cb54a0ed8 (patch) | |
| tree | 460ee0ad60988d641cf00e458fef6c91e3621370 /src/lib/j2k_image_proxy.cc | |
| parent | 666808c7f735d5ff0daff70dfb7b0c409113874e (diff) | |
| parent | 2d3092216e97c02bf715a3df19725518312a0b65 (diff) | |
Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0
Diffstat (limited to 'src/lib/j2k_image_proxy.cc')
| -rw-r--r-- | src/lib/j2k_image_proxy.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/j2k_image_proxy.cc b/src/lib/j2k_image_proxy.cc index 16b886169..59106098a 100644 --- a/src/lib/j2k_image_proxy.cc +++ b/src/lib/j2k_image_proxy.cc @@ -82,9 +82,9 @@ J2KImageProxy::image (optional<dcp::NoteHandler> note) const shared_ptr<Image> image (new Image (PIX_FMT_RGB48LE, _size, true)); if (_mono) { - dcp::xyz_to_rgb (_mono->xyz_image (), dcp::ColourConversion::xyz_to_srgb(), image->data()[0], image->stride()[0], note); + dcp::xyz_to_rgb (_mono->xyz_image (), dcp::ColourConversion::srgb_to_xyz(), image->data()[0], image->stride()[0], note); } else { - dcp::xyz_to_rgb (_stereo->xyz_image (_eye.get ()), dcp::ColourConversion::xyz_to_srgb(), image->data()[0], image->stride()[0], note); + dcp::xyz_to_rgb (_stereo->xyz_image (_eye.get ()), dcp::ColourConversion::srgb_to_xyz(), image->data()[0], image->stride()[0], note); } return image; |