diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-01-04 13:54:15 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-01-04 13:54:15 +0000 |
| commit | c2018e0dae9ed2503b6244a47524a7ce16eedb0b (patch) | |
| tree | 267fc895ab639dbd59c460867a90efe9bbee7e40 /test | |
| parent | 3a546df5dacafb99958d53c9738e135d4f0deb2b (diff) | |
Try to fix static initialisation order problems.
Diffstat (limited to 'test')
| -rw-r--r-- | test/colour_conversion_test.cc | 4 | ||||
| -rw-r--r-- | test/rgb_xyz_test.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/test/colour_conversion_test.cc b/test/colour_conversion_test.cc index aafd2cad..4640b36c 100644 --- a/test/colour_conversion_test.cc +++ b/test/colour_conversion_test.cc @@ -56,7 +56,7 @@ check_modified_gamma (shared_ptr<const TransferFunction> tf, int bit_depth, doub BOOST_AUTO_TEST_CASE (colour_conversion_test1) { - ColourConversion cc = ColourConversion::srgb_to_xyz; + ColourConversion cc = ColourConversion::srgb_to_xyz (); check_modified_gamma (cc.in(), 8, 2.4, 0.04045, 0.055, 12.92); check_modified_gamma (cc.in(), 12, 2.4, 0.04045, 0.055, 12.92); @@ -69,7 +69,7 @@ BOOST_AUTO_TEST_CASE (colour_conversion_test1) BOOST_AUTO_TEST_CASE (colour_conversion_test2) { - ColourConversion cc = ColourConversion::rec709_to_xyz; + ColourConversion cc = ColourConversion::rec709_to_xyz (); check_modified_gamma (cc.in(), 8, 2.4, 0.081, 0.099, 4.5); check_modified_gamma (cc.in(), 12, 2.4, 0.081, 0.099, 4.5); diff --git a/test/rgb_xyz_test.cc b/test/rgb_xyz_test.cc index 2927bd9a..2c76bb33 100644 --- a/test/rgb_xyz_test.cc +++ b/test/rgb_xyz_test.cc @@ -73,7 +73,7 @@ BOOST_AUTO_TEST_CASE (rgb_xyz_test) } } - shared_ptr<dcp::XYZFrame> xyz = dcp::rgb_to_xyz (rgb, dcp::ColourConversion::srgb_to_xyz); + shared_ptr<dcp::XYZFrame> xyz = dcp::rgb_to_xyz (rgb, dcp::ColourConversion::srgb_to_xyz ()); for (int y = 0; y < size.height; ++y) { uint16_t* p = reinterpret_cast<uint16_t*> (rgb->data()[0] + y * rgb->stride()[0]); |