using namespace dcp;
static void
-check_gamma (shared_ptr<const TransferFunction> tf, int bit_depth, float gamma)
+check_gamma (shared_ptr<const TransferFunction> tf, int bit_depth, bool inverse, float gamma)
{
- double const * lut = tf->lut (bit_depth);
- int const count = pow (2, bit_depth);
+ double const * lut = tf->lut (bit_depth, inverse);
+ int const count = rint (pow (2.0, bit_depth));
for (int i = 0; i < count; ++i) {
- BOOST_CHECK_CLOSE (lut[i], pow (double(i) / (count - 1), gamma), 0.001);
+ BOOST_CHECK_CLOSE (lut[i], pow (float(i) / (count - 1), gamma), 0.001);
}
}
static void
-check_modified_gamma (shared_ptr<const TransferFunction> tf, int bit_depth, double power, double threshold, double A, double B)
+check_modified_gamma (shared_ptr<const TransferFunction> tf, int bit_depth, bool inverse, double power, double threshold, double A, double B)
{
- double const * lut = tf->lut (bit_depth);
- int const count = pow (2, bit_depth);
+ double const * lut = tf->lut (bit_depth, inverse);
+ int const count = rint (pow (2.0, bit_depth));
for (int i = 0; i < count; ++i) {
double const x = double(i) / (count - 1);
{
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);
- check_modified_gamma (cc.in(), 16, 2.4, 0.04045, 0.055, 12.92);
+ check_modified_gamma (cc.in(), 8, false, 2.4, 0.04045, 0.055, 12.92);
+ check_modified_gamma (cc.in(), 12, false, 2.4, 0.04045, 0.055, 12.92);
+ check_modified_gamma (cc.in(), 16, false, 2.4, 0.04045, 0.055, 12.92);
- check_gamma (cc.out(), 8, 1 / 2.6);
- check_gamma (cc.out(), 12, 1 / 2.6);
- check_gamma (cc.out(), 16, 1 / 2.6);
+ check_gamma (cc.out(), 8, true, 1 / 2.6);
+ check_gamma (cc.out(), 12, true, 1 / 2.6);
+ check_gamma (cc.out(), 16, true, 1 / 2.6);
}
BOOST_AUTO_TEST_CASE (colour_conversion_test2)
{
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);
- check_modified_gamma (cc.in(), 16, 2.4, 0.081, 0.099, 4.5);
+ check_modified_gamma (cc.in(), 8, false, 1 / 0.45, 0.081, 0.099, 4.5);
+ check_modified_gamma (cc.in(), 12, false, 1 / 0.45, 0.081, 0.099, 4.5);
+ check_modified_gamma (cc.in(), 16, false, 1 / 0.45, 0.081, 0.099, 4.5);
- check_gamma (cc.out(), 8, 1 / 2.6);
- check_gamma (cc.out(), 12, 1 / 2.6);
- check_gamma (cc.out(), 16, 1 / 2.6);
+ check_gamma (cc.out(), 8, true, 1 / 2.6);
+ check_gamma (cc.out(), 12, true, 1 / 2.6);
+ check_gamma (cc.out(), 16, true, 1 / 2.6);
}