diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-06-10 15:05:48 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-06-10 15:05:48 +0100 |
| commit | 41ab9a3ad26bb2fd17eca4d99780c46e315c393a (patch) | |
| tree | 67561be4fe87b1e2dd3ae56664baa8c3a033e2aa /test | |
| parent | da2cb0bddaaca815440a06884cf3364050e03a0e (diff) | |
Rename XYZImage -> OpenJPEGImage.
Diffstat (limited to 'test')
| -rw-r--r-- | test/decryption_test.cc | 4 | ||||
| -rw-r--r-- | test/rgb_xyz_test.cc | 6 | ||||
| -rw-r--r-- | test/round_trip_test.cc | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/test/decryption_test.cc b/test/decryption_test.cc index 0974b85d..16b2c469 100644 --- a/test/decryption_test.cc +++ b/test/decryption_test.cc @@ -26,7 +26,7 @@ #include "reel_picture_asset.h" #include "reel.h" #include "test.h" -#include "xyz_image.h" +#include "openjpeg_image.h" #include "rgb_xyz.h" #include "colour_conversion.h" #include <boost/test/unit_test.hpp> @@ -47,7 +47,7 @@ get_frame (dcp::DCP const & dcp) shared_ptr<const dcp::MonoPictureAsset> mono_picture = dynamic_pointer_cast<const dcp::MonoPictureAsset> (picture); shared_ptr<const dcp::MonoPictureFrame> j2k_frame = mono_picture->get_frame (0); - shared_ptr<dcp::XYZImage> xyz = j2k_frame->xyz_image(); + shared_ptr<dcp::OpenJPEGImage> xyz = j2k_frame->xyz_image(); uint8_t* argb = new uint8_t[xyz->size().width * xyz->size().height * 4]; dcp::xyz_to_rgba (j2k_frame->xyz_image(), dcp::ColourConversion::srgb_to_xyz(), argb); diff --git a/test/rgb_xyz_test.cc b/test/rgb_xyz_test.cc index 0b427893..22baab26 100644 --- a/test/rgb_xyz_test.cc +++ b/test/rgb_xyz_test.cc @@ -18,7 +18,7 @@ */ #include "rgb_xyz.h" -#include "xyz_image.h" +#include "openjpeg_image.h" #include "colour_conversion.h" #include <boost/test/unit_test.hpp> #include <boost/bind.hpp> @@ -49,7 +49,7 @@ BOOST_AUTO_TEST_CASE (rgb_xyz_test) } } - shared_ptr<dcp::XYZImage> xyz = dcp::rgb_to_xyz (rgb.get(), size, size.width * 6, dcp::ColourConversion::srgb_to_xyz ()); + shared_ptr<dcp::OpenJPEGImage> xyz = dcp::rgb_to_xyz (rgb.get(), size, size.width * 6, dcp::ColourConversion::srgb_to_xyz ()); for (int y = 0; y < size.height; ++y) { uint16_t* p = reinterpret_cast<uint16_t*> (rgb.get() + y * size.width * 6); @@ -116,7 +116,7 @@ note_handler (dcp::NoteType n, string s) /** Check that xyz_to_rgb clamps XYZ values correctly */ BOOST_AUTO_TEST_CASE (xyz_rgb_range_test) { - shared_ptr<dcp::XYZImage> xyz (new dcp::XYZImage (dcp::Size (2, 2))); + shared_ptr<dcp::OpenJPEGImage> xyz (new dcp::OpenJPEGImage (dcp::Size (2, 2))); xyz->data(0)[0] = -4; xyz->data(0)[1] = 6901; diff --git a/test/round_trip_test.cc b/test/round_trip_test.cc index 39db697b..2d10764a 100644 --- a/test/round_trip_test.cc +++ b/test/round_trip_test.cc @@ -32,7 +32,7 @@ #include "reel_picture_asset.h" #include "reel_mono_picture_asset.h" #include "file.h" -#include "xyz_image.h" +#include "openjpeg_image.h" #include "rgb_xyz.h" #include "colour_conversion.h" #include <boost/test/unit_test.hpp> @@ -106,8 +106,8 @@ BOOST_AUTO_TEST_CASE (round_trip_test) BOOST_CHECK (!kdm_B.keys().empty ()); asset_B->set_key (kdm_B.keys().front().key()); - shared_ptr<dcp::XYZImage> xyz_A = asset_A->get_frame(0)->xyz_image (); - shared_ptr<dcp::XYZImage> xyz_B = asset_B->get_frame(0)->xyz_image (); + shared_ptr<dcp::OpenJPEGImage> xyz_A = asset_A->get_frame(0)->xyz_image (); + shared_ptr<dcp::OpenJPEGImage> xyz_B = asset_B->get_frame(0)->xyz_image (); scoped_array<uint8_t> frame_A (new uint8_t[xyz_A->size().width * xyz_A->size().height * 4]); dcp::xyz_to_rgba (xyz_A, dcp::ColourConversion::srgb_to_xyz(), frame_A.get()); |