Merge master.

[dcpomatic.git] / test / colour_conversion_test.cc

diff --git a/test/colour_conversion_test.cc b/test/colour_conversion_test.cc
index f850847b837164264ad81bdb28284c43dbdf4c6a..7de169dd3e305ad23d76dbaf12b756ef80ccaebb 100644 (file)
--- a/test/colour_conversion_test.cc
+++ b/test/colour_conversion_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,17 +17,20 @@
 
 */
 
+/** @file  test/colour_conversion_test.cc
+ *  @brief Basic test of identifier() for ColourConversion (i.e. a hash of the numbers)
+ */
+
 #include <boost/test/unit_test.hpp>
-#include <libdcp/colour_matrix.h>
+#include <dcp/colour_matrix.h>
 #include "lib/colour_conversion.h"
 
 using std::cout;
 
-/* Basic test of identifier() for ColourConversion (i.e. a hash of the numbers) */
 BOOST_AUTO_TEST_CASE (colour_conversion_test)
 {
-       ColourConversion A (2.4, true, libdcp::colour_matrix::srgb_to_xyz, 2.6);
-       ColourConversion B (2.4, false, libdcp::colour_matrix::srgb_to_xyz, 2.6);
+       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);
 
        BOOST_CHECK_EQUAL (A.identifier(), "1e720d2d99add654d7816f3b72da815e");
        BOOST_CHECK_EQUAL (B.identifier(), "18751a247b22682b725bf9c4caf71522");