diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-07-08 22:42:44 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-07-08 22:42:44 +0100 |
| commit | 7c386ee3f400d80f043bc0b271a0184e35a08169 (patch) | |
| tree | 893dab410e68cf1fdfd3e709364b92a44942e92a | |
| parent | 5d8222829b5d14327ae6b63eb31e9fef0f9b4bdb (diff) | |
Rename xyz_to_rgb to xyz_to_rgba.
| -rw-r--r-- | src/mono_picture_frame.cc | 2 | ||||
| -rw-r--r-- | src/rgb_xyz.cc | 4 | ||||
| -rw-r--r-- | src/rgb_xyz.h | 2 | ||||
| -rw-r--r-- | src/stereo_picture_frame.cc | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/mono_picture_frame.cc b/src/mono_picture_frame.cc index c2f8abb7..ec60104d 100644 --- a/src/mono_picture_frame.cc +++ b/src/mono_picture_frame.cc @@ -91,7 +91,7 @@ MonoPictureFrame::j2k_size () const shared_ptr<ARGBFrame> MonoPictureFrame::argb_frame (int reduce, float srgb_gamma) const { - return xyz_to_rgb ( + return xyz_to_rgba ( decompress_j2k (const_cast<uint8_t*> (_buffer->RoData()), _buffer->Size(), reduce), GammaLUT::cache.get (12, DCI_GAMMA, false), GammaLUT::cache.get (12, 1 / srgb_gamma, false) ); diff --git a/src/rgb_xyz.cc b/src/rgb_xyz.cc index 72ee38c1..42f48cde 100644 --- a/src/rgb_xyz.cc +++ b/src/rgb_xyz.cc @@ -32,14 +32,14 @@ using namespace dcp; #define DCI_COEFFICIENT (48.0 / 52.37) -/** Convert an openjpeg XYZ image to RGB. +/** Convert an openjpeg XYZ image to RGBA. * @param xyz_frame Frame in XYZ. * @param lut_in Input Gamma LUT to use. * @param lut_out Output Gamma LUT to use. * @return RGB image. */ shared_ptr<ARGBFrame> -dcp::xyz_to_rgb ( +dcp::xyz_to_rgba ( boost::shared_ptr<const XYZFrame> xyz_frame, boost::shared_ptr<const GammaLUT> lut_in, boost::shared_ptr<const GammaLUT> lut_out diff --git a/src/rgb_xyz.h b/src/rgb_xyz.h index 28e09230..998c6401 100644 --- a/src/rgb_xyz.h +++ b/src/rgb_xyz.h @@ -26,7 +26,7 @@ class XYZFrame; class GammaLUT; class Image; -extern boost::shared_ptr<ARGBFrame> xyz_to_rgb ( +extern boost::shared_ptr<ARGBFrame> xyz_to_rgba ( boost::shared_ptr<const XYZFrame>, boost::shared_ptr<const GammaLUT>, boost::shared_ptr<const GammaLUT> ); diff --git a/src/stereo_picture_frame.cc b/src/stereo_picture_frame.cc index 0b56b216..293573bd 100644 --- a/src/stereo_picture_frame.cc +++ b/src/stereo_picture_frame.cc @@ -84,7 +84,7 @@ StereoPictureFrame::argb_frame (Eye eye, int reduce, float srgb_gamma) const break; } - return xyz_to_rgb (xyz_frame, GammaLUT::cache.get (12, DCI_GAMMA, false), GammaLUT::cache.get (12, 1 / srgb_gamma, false)); + return xyz_to_rgba (xyz_frame, GammaLUT::cache.get (12, DCI_GAMMA, false), GammaLUT::cache.get (12, 1 / srgb_gamma, false)); } uint8_t const * |