diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-04-23 17:55:08 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-04-23 17:55:08 +0100 |
| commit | de55fefe3f977a3552e95400c0e9f5183c14a181 (patch) | |
| tree | 54b382935975e0a17d723b3d1fefdf52dbafd7b7 /src/lib/j2k_image_proxy.cc | |
| parent | 9f1deb2a9cd1565f7f195b1601bbf6ddb81ae950 (diff) | |
| parent | 20a733fe6782eff04622b5bd189417f391b9cfb9 (diff) | |
Merge branch '2.0' of ssh://main.carlh.net/home/carl/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; |