Remove unused code.

5 files changed, 0 insertions, 97 deletions

diff --git a/src/colour_conversion.cc b/src/colour_conversion.cc
index 26e53619..16691061 100644
--- a/src/colour_conversion.cc
+++ b/src/colour_conversion.cc
@@ -36,7 +36,6 @@
 #include "modified_gamma_transfer_function.h"
 #include "s_gamut3_transfer_function.h"
 #include "identity_transfer_function.h"
-#include "colour_matrix.h"
 #include "dcp_assert.h"
 #include <boost/numeric/ublas/matrix.hpp>
 #include <boost/numeric/ublas/lu.hpp>
diff --git a/src/colour_matrix.cc b/src/colour_matrix.cc
deleted file mode 100644
index 767edbc9..00000000
--- a/src/colour_matrix.cc
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
-
-    This file is part of libdcp.
-
-    libdcp 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.
-
-    libdcp 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 libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
-    In addition, as a special exception, the copyright holders give
-    permission to link the code of portions of this program with the
-    OpenSSL library under certain conditions as described in each
-    individual source file, and distribute linked combinations
-    including the two.
-
-    You must obey the GNU General Public License in all respects
-    for all of the code used other than OpenSSL.  If you modify
-    file(s) with this exception, you may extend this exception to your
-    version of the file(s), but you are not obligated to do so.  If you
-    do not wish to do so, delete this exception statement from your
-    version.  If you delete this exception statement from all source
-    files in the program, then also delete it here.
-*/
-
-#include "colour_matrix.h"
-
-/* sRGB colour matrix for XYZ -> RGB.  This is the same as the one used by the Fraunhofer
-   EasyDCP player, I think.
-*/
-
-double const dcp::colour_matrix::xyz_to_rgb[3][3] = {
-	{  3.24096989631653,   -1.5373831987381,  -0.498610764741898 },
-	{ -0.96924364566803,    1.87596750259399,  0.0415550582110882 },
-	{  0.0556300804018974, -0.203976958990097, 1.05697154998779 }
-};
-
-double const dcp::colour_matrix::rgb_to_xyz[3][3] = {
-	{0.4124564, 0.3575761, 0.1804375},
-	{0.2126729, 0.7151522, 0.0721750},
-	{0.0193339, 0.1191920, 0.9503041}
-};
diff --git a/src/colour_matrix.h b/src/colour_matrix.h
deleted file mode 100644
index 48659b35..00000000
--- a/src/colour_matrix.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
-
-    This file is part of libdcp.
-
-    libdcp 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.
-
-    libdcp 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 libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
-    In addition, as a special exception, the copyright holders give
-    permission to link the code of portions of this program with the
-    OpenSSL library under certain conditions as described in each
-    individual source file, and distribute linked combinations
-    including the two.
-
-    You must obey the GNU General Public License in all respects
-    for all of the code used other than OpenSSL.  If you modify
-    file(s) with this exception, you may extend this exception to your
-    version of the file(s), but you are not obligated to do so.  If you
-    do not wish to do so, delete this exception statement from your
-    version.  If you delete this exception statement from all source
-    files in the program, then also delete it here.
-*/
-
-namespace dcp {
-
-namespace colour_matrix {
-
-extern double const xyz_to_rgb[3][3];
-extern double const rgb_to_xyz[3][3];
-
-}
-
-}
diff --git a/src/rgb_xyz.cc b/src/rgb_xyz.cc
index f0480431..1110accb 100644
--- a/src/rgb_xyz.cc
+++ b/src/rgb_xyz.cc
@@ -33,7 +33,6 @@
 
 #include "rgb_xyz.h"
 #include "openjpeg_image.h"
-#include "colour_matrix.h"
 #include "colour_conversion.h"
 #include "transfer_function.h"
 #include "dcp_assert.h"
diff --git a/src/wscript b/src/wscript
index 7c3bcc37..3fd10639 100644
--- a/src/wscript
+++ b/src/wscript
@@ -42,7 +42,6 @@ def build(bld):
              certificate.cc
              chromaticity.cc
              colour_conversion.cc
-             colour_matrix.cc
              cpl.cc
              data.cc
              dcp.cc
@@ -115,7 +114,6 @@ def build(bld):
               certificate.h
               chromaticity.h
               colour_conversion.h
-              colour_matrix.h
               cpl.h
               dcp.h
               dcp_assert.h