diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-07-12 20:55:29 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-07-12 20:55:29 +0100 |
| commit | f28303e1f00075841ac00fe4bb18ca37cbf1a7af (patch) | |
| tree | 82329bd11c6b061beec3c2e0f6db701fd7983fa4 /src/picture_frame.cc | |
| parent | 493875161c36a782a785c191ff997c8e26cccde3 (diff) | |
Add XYZFrame and use it.
Diffstat (limited to 'src/picture_frame.cc')
| -rw-r--r-- | src/picture_frame.cc | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/picture_frame.cc b/src/picture_frame.cc index b4d72f6f..d0784245 100644 --- a/src/picture_frame.cc +++ b/src/picture_frame.cc @@ -81,11 +81,10 @@ MonoPictureFrame::j2k_size () const shared_ptr<ARGBFrame> 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), GammaLUT::cache.get (12, 1 / srgb_gamma)); - opj_image_destroy (xyz_frame); - return f; + return xyz_to_rgb ( + decompress_j2k (const_cast<uint8_t*> (_buffer->RoData()), _buffer->Size(), reduce), + GammaLUT::cache.get (12, DCI_GAMMA), GammaLUT::cache.get (12, 1 / srgb_gamma) + ); } /** Make a picture frame from a 3D (stereoscopic) asset. @@ -127,7 +126,7 @@ StereoPictureFrame::~StereoPictureFrame () shared_ptr<ARGBFrame> StereoPictureFrame::argb_frame (Eye eye, int reduce, float srgb_gamma) const { - opj_image_t* xyz_frame = 0; + shared_ptr<XYZFrame> xyz_frame; switch (eye) { case LEFT: xyz_frame = decompress_j2k (const_cast<uint8_t*> (_buffer->Left.RoData()), _buffer->Left.Size(), reduce); @@ -137,10 +136,7 @@ StereoPictureFrame::argb_frame (Eye eye, int reduce, float srgb_gamma) const break; } - assert (xyz_frame->numcomps == 3); - 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; + return xyz_to_rgb (xyz_frame, GammaLUT::cache.get (12, DCI_GAMMA), GammaLUT::cache.get (12, 1 / srgb_gamma)); } uint8_t const * |