Rename color -> colour.

4 files changed, 53 insertions, 53 deletions

diff --git a/test/color_test.cc b/test/colour_test.cc
index d68f59d4..5efccead 100644
--- a/test/color_test.cc
+++ b/test/colour_test.cc
@@ -21,24 +21,24 @@
 
 #include "util.h"
 
-/* Check that dcp::Color works */
-BOOST_AUTO_TEST_CASE (color)
+/* Check that dcp::Colour works */
+BOOST_AUTO_TEST_CASE (colour)
 {
-	dcp::Color c ("FFFF0000");
+	dcp::Colour c ("FFFF0000");
 
 	BOOST_CHECK_EQUAL (c.r, 255);
 	BOOST_CHECK_EQUAL (c.g, 0);
 	BOOST_CHECK_EQUAL (c.b, 0);
 	BOOST_CHECK_EQUAL (c.to_argb_string(), "FFFF0000");
 
-	c = dcp::Color ("FF00FF00");
+	c = dcp::Colour ("FF00FF00");
 
 	BOOST_CHECK_EQUAL (c.r, 0);
 	BOOST_CHECK_EQUAL (c.g, 255);
 	BOOST_CHECK_EQUAL (c.b, 0);
 	BOOST_CHECK_EQUAL (c.to_argb_string(), "FF00FF00");
 
-	c = dcp::Color ("FF0000FF");
+	c = dcp::Colour ("FF0000FF");
 
 	BOOST_CHECK_EQUAL (c.r, 0);
 	BOOST_CHECK_EQUAL (c.g, 0);
diff --git a/test/opendcp_lut.h b/test/opendcp_lut.h
index d8fbd930..f25afd4c 100644
--- a/test/opendcp_lut.h
+++ b/test/opendcp_lut.h
@@ -49,7 +49,7 @@ enum LUT_OUT_ENUM {
     LO_MAX
 };
 
-extern float color_matrix[3][3][3];
+extern float colour_matrix[3][3][3];
 extern float lut_in[LI_MAX][4095+1];
 extern int lut_out[1][DCI_LUT_SIZE];
 
diff --git a/test/subtitle_tests.cc b/test/subtitle_tests.cc
index e8175cbb..c7137bec 100644
--- a/test/subtitle_tests.cc
+++ b/test/subtitle_tests.cc
@@ -37,7 +37,7 @@ BOOST_AUTO_TEST_CASE (subtitles1)
 	BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
 				   string ("theFontId"),
 				   false,
-				   dcp::Color (255, 255, 255),
+				   dcp::Colour (255, 255, 255),
 				   39,
 				   dcp::Time (0, 0, 5, 198),
 				   dcp::Time (0, 0, 7, 115),
@@ -45,7 +45,7 @@ BOOST_AUTO_TEST_CASE (subtitles1)
 				   dcp::BOTTOM,
 				   "My jacket was Idi Amin's",
 				   dcp::BORDER,
-				   dcp::Color (0, 0, 0),
+				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 1),
 				   dcp::Time (0, 0, 0, 1)
 				   ));
@@ -55,7 +55,7 @@ BOOST_AUTO_TEST_CASE (subtitles1)
 	BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
 				   string ("theFontId"),
 				   true,
-				   dcp::Color (255, 255, 255),
+				   dcp::Colour (255, 255, 255),
 				   39,
 				   dcp::Time (0, 0, 7, 177),
 				   dcp::Time (0, 0, 11, 31),
@@ -63,14 +63,14 @@ BOOST_AUTO_TEST_CASE (subtitles1)
 				   dcp::BOTTOM,
 				   "My corset was H.M. The Queen's",
 				   dcp::BORDER,
-				   dcp::Color (0, 0, 0),
+				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 1),
 				   dcp::Time (0, 0, 0, 1)
 				   ));
 	BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
 				   string ("theFontId"),
 				   false,
-				   dcp::Color (255, 255, 255),
+				   dcp::Colour (255, 255, 255),
 				   39,
 				   dcp::Time (0, 0, 7, 177),
 				   dcp::Time (0, 0, 11, 31),
@@ -78,7 +78,7 @@ BOOST_AUTO_TEST_CASE (subtitles1)
 				   dcp::BOTTOM,
 				   "My large wonderbra",
 				   dcp::BORDER,
-				   dcp::Color (0, 0, 0),
+				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 1),
 				   dcp::Time (0, 0, 0, 1)
 				   ));
@@ -88,7 +88,7 @@ BOOST_AUTO_TEST_CASE (subtitles1)
 	BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
 				   string ("theFontId"),
 				   false,
-				   dcp::Color (255, 255, 255),
+				   dcp::Colour (255, 255, 255),
 				   39,
 				   dcp::Time (0, 0, 11, 94),
 				   dcp::Time (0, 0, 13, 63),
@@ -96,7 +96,7 @@ BOOST_AUTO_TEST_CASE (subtitles1)
 				   dcp::BOTTOM,
 				   "Once belonged to the Shah",
 				   dcp::BORDER,
-				   dcp::Color (0, 0, 0),
+				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 1),
 				   dcp::Time (0, 0, 0, 1)
 				   ));
@@ -106,7 +106,7 @@ BOOST_AUTO_TEST_CASE (subtitles1)
 	BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
 				   string ("theFontId"),
 				   false,
-				   dcp::Color (255, 255, 255),
+				   dcp::Colour (255, 255, 255),
 				   39,
 				   dcp::Time (0, 0, 13, 104),
 				   dcp::Time (0, 0, 15, 177),
@@ -114,7 +114,7 @@ BOOST_AUTO_TEST_CASE (subtitles1)
 				   dcp::BOTTOM,
 				   "And these are Roy Hattersley's jeans",
 				   dcp::BORDER,
-				   dcp::Color (0, 0, 0),
+				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 1),
 				   dcp::Time (0, 0, 0, 1)
 				   ));
@@ -130,7 +130,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 	BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
-				   dcp::Color (255, 255, 255),
+				   dcp::Colour (255, 255, 255),
 				   42,
 				   dcp::Time (0, 0, 41, 62),
 				   dcp::Time (0, 0, 43, 52),
@@ -138,14 +138,14 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   dcp::TOP,
 				   "At afternoon tea with John Peel",
 				   dcp::BORDER,
-				   dcp::Color (0, 0, 0),
+				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 0),
 				   dcp::Time (0, 0, 0, 0)
 				   ));
 	BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
-				   dcp::Color (255, 255, 255),
+				   dcp::Colour (255, 255, 255),
 				   42,
 				   dcp::Time (0, 0, 41, 62),
 				   dcp::Time (0, 0, 43, 52),
@@ -153,7 +153,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   dcp::TOP,
 				   "I enquired if his accent was real",
 				   dcp::BORDER,
-				   dcp::Color (0, 0, 0),
+				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 0),
 				   dcp::Time (0, 0, 0, 0)
 				   ));
@@ -163,7 +163,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 	BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
-				   dcp::Color (255, 255, 255),
+				   dcp::Colour (255, 255, 255),
 				   42,
 				   dcp::Time (0, 0, 50, 42),
 				   dcp::Time (0, 0, 52, 21),
@@ -171,14 +171,14 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   dcp::TOP,
 				   "He said \"out of the house",
 				   dcp::BORDER,
-				   dcp::Color (0, 0, 0),
+				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 0),
 				   dcp::Time (0, 0, 0, 0)
 				   ));
 	BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
-				   dcp::Color (255, 255, 255),
+				   dcp::Colour (255, 255, 255),
 				   42,
 				   dcp::Time (0, 0, 50, 42),
 				   dcp::Time (0, 0, 52, 21),
@@ -186,7 +186,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   dcp::TOP,
 				   "I'm incredibly scouse",
 				   dcp::BORDER,
-				   dcp::Color (0, 0, 0),
+				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 0),
 				   dcp::Time (0, 0, 0, 0)
 				   ));
@@ -196,7 +196,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 	BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
-				   dcp::Color (255, 255, 255),
+				   dcp::Colour (255, 255, 255),
 				   42,
 				   dcp::Time (0, 1, 2, 208),
 				   dcp::Time (0, 1, 4, 10),
@@ -204,14 +204,14 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   dcp::TOP,
 				   "At home it depends how I feel.\"",
 				   dcp::BORDER,
-				   dcp::Color (0, 0, 0),
+				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 0),
 				   dcp::Time (0, 0, 0, 0)
 				   ));
 	BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
-				   dcp::Color (255, 255, 255),
+				   dcp::Colour (255, 255, 255),
 				   42,
 				   dcp::Time (0, 1, 2, 208),
 				   dcp::Time (0, 1, 4, 10),
@@ -219,7 +219,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   dcp::TOP,
 				   "I spent a long weekend in Brighton",
 				   dcp::BORDER,
-				   dcp::Color (0, 0, 0),
+				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 0),
 				   dcp::Time (0, 0, 0, 0)
 				   ));
@@ -229,7 +229,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 	BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
-				   dcp::Color (255, 255, 255),
+				   dcp::Colour (255, 255, 255),
 				   42,
 				   dcp::Time (0, 1, 15, 42),
 				   dcp::Time (0, 1, 16, 42),
@@ -237,14 +237,14 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   dcp::TOP,
 				   "With the legendary Miss Enid Blyton",
 				   dcp::BORDER,
-				   dcp::Color (0, 0, 0),
+				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 0),
 				   dcp::Time (0, 0, 0, 0)
 				   ));
 	BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
-				   dcp::Color (255, 255, 255),
+				   dcp::Colour (255, 255, 255),
 				   42,
 				   dcp::Time (0, 1, 15, 42),
 				   dcp::Time (0, 1, 16, 42),
@@ -252,7 +252,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   dcp::TOP,
 				   "She said \"you be Noddy",
 				   dcp::BORDER,
-				   dcp::Color (0, 0, 0),
+				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 0),
 				   dcp::Time (0, 0, 0, 0)
 				   ));
@@ -262,7 +262,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 	BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
-				   dcp::Color (255, 255, 255),
+				   dcp::Colour (255, 255, 255),
 				   42,
 				   dcp::Time (0, 1, 27, 115),
 				   dcp::Time (0, 1, 28, 208),
@@ -270,14 +270,14 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   dcp::TOP,
 				   "That curious creature the Sphinx",
 				   dcp::BORDER,
-				   dcp::Color (0, 0, 0),
+				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 0),
 				   dcp::Time (0, 0, 0, 0)
 				   ));
 	BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
-				   dcp::Color (255, 255, 255),
+				   dcp::Colour (255, 255, 255),
 				   42,
 				   dcp::Time (0, 1, 27, 115),
 				   dcp::Time (0, 1, 28, 208),
@@ -285,7 +285,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   dcp::TOP,
 				   "Is smarter than anyone thinks",
 				   dcp::BORDER,
-				   dcp::Color (0, 0, 0),
+				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 0),
 				   dcp::Time (0, 0, 0, 0)
 				   ));
@@ -295,7 +295,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 	BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
 				   string ("theFont"),
 				   false,
-				   dcp::Color (255, 255, 255),
+				   dcp::Colour (255, 255, 255),
 				   42,
 				   dcp::Time (0, 1, 42, 229),
 				   dcp::Time (0, 1, 45, 62),
@@ -303,14 +303,14 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   dcp::TOP,
 				   "It sits there and smirks",
 				   dcp::BORDER,
-				   dcp::Color (0, 0, 0),
+				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 0),
 				   dcp::Time (0, 0, 0, 0)
 				   ));
 	BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
 				   string ("theFont"),
 				   false,
-				   dcp::Color (255, 255, 255),
+				   dcp::Colour (255, 255, 255),
 				   42,
 				   dcp::Time (0, 1, 42, 229),
 				   dcp::Time (0, 1, 45, 62),
@@ -318,7 +318,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   dcp::TOP,
 				   "And you don't think it works",
 				   dcp::BORDER,
-				   dcp::Color (0, 0, 0),
+				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 0),
 				   dcp::Time (0, 0, 0, 0)
 				   ));
@@ -328,7 +328,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 	BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
 				   string ("theFont"),
 				   false,
-				   dcp::Color (255, 255, 255),
+				   dcp::Colour (255, 255, 255),
 				   42,
 				   dcp::Time (0, 1, 45, 146),
 				   dcp::Time (0, 1, 47, 94),
@@ -336,14 +336,14 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   dcp::TOP,
 				   "Then when you're not looking, it winks.",
 				   dcp::BORDER,
-				   dcp::Color (0, 0, 0),
+				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 0),
 				   dcp::Time (0, 0, 0, 0)
 				   ));
 	BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
 				   string ("theFont"),
 				   false,
-				   dcp::Color (255, 255, 255),
+				   dcp::Colour (255, 255, 255),
 				   42,
 				   dcp::Time (0, 1, 45, 146),
 				   dcp::Time (0, 1, 47, 94),
@@ -351,7 +351,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   dcp::TOP,
 				   "When it snows you will find Sister Sledge",
 				   dcp::BORDER,
-				   dcp::Color (0, 0, 0),
+				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 0),
 				   dcp::Time (0, 0, 0, 0)
 				   ));
@@ -361,7 +361,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 	BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
 				   string ("theFont"),
 				   false,
-				   dcp::Color (255, 255, 255),
+				   dcp::Colour (255, 255, 255),
 				   42,
 				   dcp::Time (0, 1, 47, 146),
 				   dcp::Time (0, 1, 48, 167),
@@ -369,14 +369,14 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   dcp::TOP,
 				   "Out mooning, at night, on the ledge",
 				   dcp::BORDER,
-				   dcp::Color (0, 0, 0),
+				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 0),
 				   dcp::Time (0, 0, 0, 0)
 				   ));
 	BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
 				   string ("theFont"),
 				   false,
-				   dcp::Color (255, 255, 255),
+				   dcp::Colour (255, 255, 255),
 				   42,
 				   dcp::Time (0, 1, 47, 146),
 				   dcp::Time (0, 1, 48, 167),
@@ -384,7 +384,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   dcp::TOP,
 				   "One storey down",
 				   dcp::BORDER,
-				   dcp::Color (0, 0, 0),
+				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 0),
 				   dcp::Time (0, 0, 0, 0)
 				   ));
@@ -394,7 +394,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 	BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
-				   dcp::Color (255, 255, 255),
+				   dcp::Colour (255, 255, 255),
 				   42,
 				   dcp::Time (0, 2, 5, 208),
 				   dcp::Time (0, 2, 7, 31),
@@ -402,14 +402,14 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   dcp::TOP,
 				   "HELLO",
 				   dcp::BORDER,
-				   dcp::Color (0, 0, 0),
+				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 0),
 				   dcp::Time (0, 0, 0, 0)
 				   ));
 	BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
-				   dcp::Color (255, 255, 255),
+				   dcp::Colour (255, 255, 255),
 				   42,
 				   dcp::Time (0, 2, 5, 208),
 				   dcp::Time (0, 2, 7, 31),
@@ -417,7 +417,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   dcp::TOP,
 				   "WORLD",
 				   dcp::BORDER,
-				   dcp::Color (0, 0, 0),
+				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 0),
 				   dcp::Time (0, 0, 0, 0)
 				   ));
diff --git a/test/wscript b/test/wscript
index 7e7122b1..1ac7cb3e 100644
--- a/test/wscript
+++ b/test/wscript
@@ -22,7 +22,7 @@ def build(bld):
     obj.use    = 'libdcp%s' % bld.env.API_VERSION
     obj.source = """
                  certificates_test.cc
-                 color_test.cc
+                 colour_test.cc
                  cpl_sar_test.cc
                  dcp_test.cc
                  dcp_time_test.cc