X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fcolour_conversion_test.cc;h=3b6a0e19870a2c0bf7dc55b312aa50f8b913481b;hb=9dfa51bdc24431ca00f424a9c33f4d1a3f465a1d;hp=7de169dd3e305ad23d76dbaf12b756ef80ccaebb;hpb=cf8bbea2de38c4e9ac140f55b27311b7b6dcd814;p=dcpomatic.git

diff --git a/test/colour_conversion_test.cc b/test/colour_conversion_test.cc
index 7de169dd3..3b6a0e198 100644
--- a/test/colour_conversion_test.cc
+++ b/test/colour_conversion_test.cc
@@ -18,20 +18,83 @@
 */
 
 /** @file  test/colour_conversion_test.cc
- *  @brief Basic test of identifier() for ColourConversion (i.e. a hash of the numbers)
+ *  @brief Various tests of ColourConversion.
  */
 
-#include <boost/test/unit_test.hpp>
-#include <dcp/colour_matrix.h>
 #include "lib/colour_conversion.h"
+#include <dcp/colour_matrix.h>
+#include <dcp/gamma_transfer_function.h>
+#include <libxml++/libxml++.h>
+#include <boost/test/unit_test.hpp>
 
 using std::cout;
+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 ());
+
+	BOOST_CHECK_EQUAL (A.identifier(), "9840c601d2775bf1b3847254bbaa36a9");
+	BOOST_CHECK_EQUAL (B.identifier(), "0778fbc5c87470f58820604a66992579");
+}
 
-BOOST_AUTO_TEST_CASE (colour_conversion_test)
+BOOST_AUTO_TEST_CASE (colour_conversion_test2)
 {
-	ColourConversion A (2.4, true, dcp::colour_matrix::srgb_to_xyz, 2.6);
-	ColourConversion B (2.4, false, dcp::colour_matrix::srgb_to_xyz, 2.6);
+	ColourConversion A (dcp::ColourConversion::srgb_to_xyz ());
+	xmlpp::Document doc;
+	xmlpp::Element* 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.4</Power>\n"
+		"    <Threshold>0.04045</Threshold>\n"
+		"    <A>0.055</A>\n"
+		"    <B>12.92</B>\n"
+		"  </InputTransferFunction>\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_CHECK_EQUAL (A.identifier(), "1e720d2d99add654d7816f3b72da815e");
-	BOOST_CHECK_EQUAL (B.identifier(), "18751a247b22682b725bf9c4caf71522");
+BOOST_AUTO_TEST_CASE (colour_conversion_test3)
+{
+	ColourConversion A (dcp::ColourConversion::rec709_to_xyz ());
+	xmlpp::Document doc;
+	xmlpp::Element* 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"
+		"  </InputTransferFunction>\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"
+		);
 }