diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-04-29 15:22:55 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-04-29 15:22:55 +0100 |
| commit | 5b6d753439207fcb33b84690bcc22d142a7c3bfa (patch) | |
| tree | 092c65d1e8d83b816cfd37ead57699d729d9f3be /src/picture_frame.cc | |
| parent | 085f9fa7a4e389a5579742f20e142513c21bbd82 (diff) | |
Change output gamma correction to be closer to EasyDCP behaviour.
Diffstat (limited to 'src/picture_frame.cc')
| -rw-r--r-- | src/picture_frame.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/picture_frame.cc b/src/picture_frame.cc index 98802101..7e6bc1f8 100644 --- a/src/picture_frame.cc +++ b/src/picture_frame.cc @@ -26,7 +26,6 @@ #include "lut.h" #include "util.h" #include "gamma_lut.h" -#include "xyz_srgb_lut.h" #define DCI_GAMMA 2.6 @@ -84,7 +83,7 @@ MonoPictureFrame::argb_frame (int reduce, float srgb_gamma) const { opj_image_t* xyz_frame = decompress_j2k (const_cast<uint8_t*> (_buffer->RoData()), _buffer->Size(), reduce); assert (xyz_frame->numcomps == 3); - shared_ptr<ARGBFrame> f = xyz_to_rgb (xyz_frame, GammaLUT::cache.get (12, DCI_GAMMA), XYZsRGBLUT::cache.get (12, srgb_gamma)); + shared_ptr<ARGBFrame> f = xyz_to_rgb (xyz_frame, GammaLUT::cache.get (12, DCI_GAMMA), GammaLUT::cache.get (12, 1 / srgb_gamma)); opj_image_destroy (xyz_frame); return f; } @@ -139,7 +138,7 @@ StereoPictureFrame::argb_frame (Eye eye, int reduce, float srgb_gamma) const } assert (xyz_frame->numcomps == 3); - shared_ptr<ARGBFrame> f = xyz_to_rgb (xyz_frame, GammaLUT::cache.get (12, DCI_GAMMA), XYZsRGBLUT::cache.get (12, srgb_gamma)); + shared_ptr<ARGBFrame> f = xyz_to_rgb (xyz_frame, GammaLUT::cache.get (12, DCI_GAMMA), GammaLUT::cache.get (12, 1 / srgb_gamma)); opj_image_destroy (xyz_frame); return f; } |