diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-02-02 19:25:43 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-02-02 19:25:43 +0000 |
| commit | 0d7fe66361a40702cb97357955cf35256f1d2c26 (patch) | |
| tree | 5cc44b13cbe6e257cb422ba9d79d1c385234495c /src/stereo_picture_frame.cc | |
| parent | 1dc082f3295f64a9fd4a103078a1dbb5121a865d (diff) | |
Rename XYZFrame -> XYZImage and ARGBFrame -> ARGBImage.
Diffstat (limited to 'src/stereo_picture_frame.cc')
| -rw-r--r-- | src/stereo_picture_frame.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/stereo_picture_frame.cc b/src/stereo_picture_frame.cc index 060e86cc..0eae7583 100644 --- a/src/stereo_picture_frame.cc +++ b/src/stereo_picture_frame.cc @@ -19,7 +19,7 @@ #include "stereo_picture_frame.h" #include "exceptions.h" -#include "argb_frame.h" +#include "argb_image.h" #include "util.h" #include "rgb_xyz.h" #include "colour_conversion.h" @@ -74,36 +74,36 @@ StereoPictureFrame::~StereoPictureFrame () * third red and fourth alpha (always 255). * */ -shared_ptr<ARGBFrame> -StereoPictureFrame::argb_frame (Eye eye, int reduce) const +shared_ptr<ARGBImage> +StereoPictureFrame::argb_image (Eye eye, int reduce) const { - shared_ptr<XYZFrame> xyz_frame; + shared_ptr<XYZImage> xyz_image; switch (eye) { case LEFT: - xyz_frame = decompress_j2k (const_cast<uint8_t*> (_buffer->Left.RoData()), _buffer->Left.Size(), reduce); + xyz_image = decompress_j2k (const_cast<uint8_t*> (_buffer->Left.RoData()), _buffer->Left.Size(), reduce); break; case RIGHT: - xyz_frame = decompress_j2k (const_cast<uint8_t*> (_buffer->Right.RoData()), _buffer->Right.Size(), reduce); + xyz_image = decompress_j2k (const_cast<uint8_t*> (_buffer->Right.RoData()), _buffer->Right.Size(), reduce); break; } - return xyz_to_rgba (xyz_frame, ColourConversion::xyz_to_srgb ()); + return xyz_to_rgba (xyz_image, ColourConversion::xyz_to_srgb ()); } void StereoPictureFrame::rgb_frame (Eye eye, shared_ptr<Image> image) const { - shared_ptr<XYZFrame> xyz_frame; + shared_ptr<XYZImage> xyz_image; switch (eye) { case LEFT: - xyz_frame = decompress_j2k (const_cast<uint8_t*> (_buffer->Left.RoData()), _buffer->Left.Size(), 0); + xyz_image = decompress_j2k (const_cast<uint8_t*> (_buffer->Left.RoData()), _buffer->Left.Size(), 0); break; case RIGHT: - xyz_frame = decompress_j2k (const_cast<uint8_t*> (_buffer->Right.RoData()), _buffer->Right.Size(), 0); + xyz_image = decompress_j2k (const_cast<uint8_t*> (_buffer->Right.RoData()), _buffer->Right.Size(), 0); break; } - return xyz_to_rgb (xyz_frame, ColourConversion::xyz_to_srgb (), image); + return xyz_to_rgb (xyz_image, ColourConversion::xyz_to_srgb (), image); } uint8_t const * |