X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fcolour_conversion_test.cc;h=c48a0b63a6c19b6d171e16a0f70717638b46a6b7;hp=3b6a0e19870a2c0bf7dc55b312aa50f8b913481b;hb=fb0e2ead59a442700c671270c7d57b5bffeaeab3;hpb=2d3092216e97c02bf715a3df19725518312a0b65

diff --git a/test/colour_conversion_test.cc b/test/colour_conversion_test.cc
index 3b6a0e198..c48a0b63a 100644
--- a/test/colour_conversion_test.cc
+++ b/test/colour_conversion_test.cc
@@ -1,49 +1,58 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
+
 /** @file  test/colour_conversion_test.cc
- *  @brief Various tests of ColourConversion.
+ *  @brief Test ColourConversion class.
+ *  @ingroup selfcontained
  */
 
+
 #include "lib/colour_conversion.h"
-#include <dcp/colour_matrix.h>
+#include "lib/film.h"
 #include <dcp/gamma_transfer_function.h>
 #include <libxml++/libxml++.h>
 #include <boost/test/unit_test.hpp>
+#include <iostream>
+
 
 using std::cout;
-using boost::shared_ptr;
+using std::make_shared;
+using std::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(), "9840c601d2775bf1b3847254bbaa36a9");
-	BOOST_CHECK_EQUAL (B.identifier(), "0778fbc5c87470f58820604a66992579");
+	BOOST_CHECK_EQUAL (B.identifier(), "58151ac92fdf333663a62c9a8ba5c5f4");
 }
 
+
 BOOST_AUTO_TEST_CASE (colour_conversion_test2)
 {
 	ColourConversion A (dcp::ColourConversion::srgb_to_xyz ());
 	xmlpp::Document doc;
-	xmlpp::Element* root = doc.create_root_node ("Test");
+	auto root = doc.create_root_node ("Test");
 	A.as_xml (root);
 	BOOST_CHECK_EQUAL (
 		doc.write_to_string_formatted ("UTF-8"),
@@ -56,6 +65,7 @@ BOOST_AUTO_TEST_CASE (colour_conversion_test2)
 		"    <A>0.055</A>\n"
 		"    <B>12.92</B>\n"
 		"  </InputTransferFunction>\n"
+		"  <YUVToRGB>0</YUVToRGB>\n"
 		"  <RedX>0.64</RedX>\n"
 		"  <RedY>0.33</RedY>\n"
 		"  <GreenX>0.3</GreenX>\n"
@@ -69,23 +79,22 @@ BOOST_AUTO_TEST_CASE (colour_conversion_test2)
 		);
 }
 
+
 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");
+	auto root = doc.create_root_node ("Test");
 	A.as_xml (root);
 	BOOST_CHECK_EQUAL (
 		doc.write_to_string_formatted ("UTF-8"),
 		"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
 		"<Test>\n"
 		"  <InputTransferFunction>\n"
-		"    <Type>ModifiedGamma</Type>\n"
-		"    <Power>2.222222222222222</Power>\n"
-		"    <Threshold>0.081</Threshold>\n"
-		"    <A>0.099</A>\n"
-		"    <B>4.5</B>\n"
+		"    <Type>Gamma</Type>\n"
+		"    <Gamma>2.2</Gamma>\n"
 		"  </InputTransferFunction>\n"
+		"  <YUVToRGB>1</YUVToRGB>\n"
 		"  <RedX>0.64</RedX>\n"
 		"  <RedY>0.33</RedY>\n"
 		"  <GreenX>0.3</GreenX>\n"
@@ -98,3 +107,17 @@ BOOST_AUTO_TEST_CASE (colour_conversion_test3)
 		"</Test>\n"
 		);
 }
+
+
+/** Test a round trip via the XML representation */
+BOOST_AUTO_TEST_CASE (colour_conversion_test4)
+{
+	for (auto const& i: PresetColourConversion::all()) {
+		xmlpp::Document out;
+		auto out_root = out.create_root_node("Test");
+		i.conversion.as_xml (out_root);
+		auto in = make_shared<cxml::Document> ("Test");
+		in->read_string (out.write_to_string("UTF-8"));
+		BOOST_CHECK (ColourConversion::from_xml(in, Film::current_state_version).get() == i.conversion);
+	}
+}