X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fcolour_conversion_test.cc;h=3b6a0e19870a2c0bf7dc55b312aa50f8b913481b;hb=c06df9e7bbd0f13d1355816b80f1a5d3ec1231b0;hp=eb3e3c294f2432f19a1dce31384c920e422b1510;hpb=6154d5f85664a26e9490c9120bef5e742af94490;p=dcpomatic.git

diff --git a/test/colour_conversion_test.cc b/test/colour_conversion_test.cc
index eb3e3c294..3b6a0e198 100644
--- a/test/colour_conversion_test.cc
+++ b/test/colour_conversion_test.cc
@@ -32,16 +32,16 @@ using boost::shared_ptr;
 
 BOOST_AUTO_TEST_CASE (colour_conversion_test1)
 {
-	ColourConversion A (dcp::ColourConversion::srgb_to_xyz);
-	ColourConversion B (dcp::ColourConversion::rec709_to_xyz);
+	ColourConversion A (dcp::ColourConversion::srgb_to_xyz ());
+	ColourConversion B (dcp::ColourConversion::rec709_to_xyz ());
 
-	BOOST_CHECK_EQUAL (A.identifier(), "8b5a265a7c63c22a6a8fc871c64d6116");
-	BOOST_CHECK_EQUAL (B.identifier(), "bc82e69f700d0426f2ae1848d05ed006");
+	BOOST_CHECK_EQUAL (A.identifier(), "9840c601d2775bf1b3847254bbaa36a9");
+	BOOST_CHECK_EQUAL (B.identifier(), "0778fbc5c87470f58820604a66992579");
 }
 
 BOOST_AUTO_TEST_CASE (colour_conversion_test2)
 {
-	ColourConversion A (dcp::ColourConversion::srgb_to_xyz);
+	ColourConversion A (dcp::ColourConversion::srgb_to_xyz ());
 	xmlpp::Document doc;
 	xmlpp::Element* root = doc.create_root_node ("Test");
 	A.as_xml (root);
@@ -51,28 +51,27 @@ BOOST_AUTO_TEST_CASE (colour_conversion_test2)
 		"<Test>\n"
 		"  <InputTransferFunction>\n"
 		"    <Type>ModifiedGamma</Type>\n"
-		"    <Power>2.400000095367432</Power>\n"
-		"    <Threshold>0.04044999927282333</Threshold>\n"
-		"    <A>0.05499999970197678</A>\n"
-		"    <B>12.92000007629395</B>\n"
+		"    <Power>2.4</Power>\n"
+		"    <Threshold>0.04045</Threshold>\n"
+		"    <A>0.055</A>\n"
+		"    <B>12.92</B>\n"
 		"  </InputTransferFunction>\n"
-		"  <Matrix i=\"0\" j=\"0\">0.4124564</Matrix>\n"
-		"  <Matrix i=\"0\" j=\"1\">0.3575761</Matrix>\n"
-		"  <Matrix i=\"0\" j=\"2\">0.1804375</Matrix>\n"
-		"  <Matrix i=\"1\" j=\"0\">0.2126729</Matrix>\n"
-		"  <Matrix i=\"1\" j=\"1\">0.7151522</Matrix>\n"
-		"  <Matrix i=\"1\" j=\"2\">0.072175</Matrix>\n"
-		"  <Matrix i=\"2\" j=\"0\">0.0193339</Matrix>\n"
-		"  <Matrix i=\"2\" j=\"1\">0.119192</Matrix>\n"
-		"  <Matrix i=\"2\" j=\"2\">0.9503041</Matrix>\n"
-		"  <OutputGamma>2.599999904632568</OutputGamma>\n"
+		"  <RedX>0.64</RedX>\n"
+		"  <RedY>0.33</RedY>\n"
+		"  <GreenX>0.3</GreenX>\n"
+		"  <GreenY>0.6</GreenY>\n"
+		"  <BlueX>0.15</BlueX>\n"
+		"  <BlueY>0.06</BlueY>\n"
+		"  <WhiteX>0.3127</WhiteX>\n"
+		"  <WhiteY>0.329</WhiteY>\n"
+		"  <OutputGamma>2.6</OutputGamma>\n"
 		"</Test>\n"
 		);
 }
 
 BOOST_AUTO_TEST_CASE (colour_conversion_test3)
 {
-	ColourConversion A (dcp::ColourConversion::rec709_to_xyz);
+	ColourConversion A (dcp::ColourConversion::rec709_to_xyz ());
 	xmlpp::Document doc;
 	xmlpp::Element* root = doc.create_root_node ("Test");
 	A.as_xml (root);
@@ -82,21 +81,20 @@ BOOST_AUTO_TEST_CASE (colour_conversion_test3)
 		"<Test>\n"
 		"  <InputTransferFunction>\n"
 		"    <Type>ModifiedGamma</Type>\n"
-		"    <Power>2.400000095367432</Power>\n"
-		"    <Threshold>0.08100000023841858</Threshold>\n"
-		"    <A>0.0989999994635582</A>\n"
+		"    <Power>2.222222222222222</Power>\n"
+		"    <Threshold>0.081</Threshold>\n"
+		"    <A>0.099</A>\n"
 		"    <B>4.5</B>\n"
 		"  </InputTransferFunction>\n"
-		"  <Matrix i=\"0\" j=\"0\">0.4124564</Matrix>\n"
-		"  <Matrix i=\"0\" j=\"1\">0.3575761</Matrix>\n"
-		"  <Matrix i=\"0\" j=\"2\">0.1804375</Matrix>\n"
-		"  <Matrix i=\"1\" j=\"0\">0.2126729</Matrix>\n"
-		"  <Matrix i=\"1\" j=\"1\">0.7151522</Matrix>\n"
-		"  <Matrix i=\"1\" j=\"2\">0.072175</Matrix>\n"
-		"  <Matrix i=\"2\" j=\"0\">0.0193339</Matrix>\n"
-		"  <Matrix i=\"2\" j=\"1\">0.119192</Matrix>\n"
-		"  <Matrix i=\"2\" j=\"2\">0.9503041</Matrix>\n"
-		"  <OutputGamma>2.599999904632568</OutputGamma>\n"
+		"  <RedX>0.64</RedX>\n"
+		"  <RedY>0.33</RedY>\n"
+		"  <GreenX>0.3</GreenX>\n"
+		"  <GreenY>0.6</GreenY>\n"
+		"  <BlueX>0.15</BlueX>\n"
+		"  <BlueY>0.06</BlueY>\n"
+		"  <WhiteX>0.3127</WhiteX>\n"
+		"  <WhiteY>0.329</WhiteY>\n"
+		"  <OutputGamma>2.6</OutputGamma>\n"
 		"</Test>\n"
 		);
 }