Remove another stringstream from DecryptedKDM.

[libdcp.git] / src / colour_matrix.cc

diff --git a/src/colour_matrix.cc b/src/colour_matrix.cc
index 72f952c3fbf888b84336bdeff5948629aeef19fb..767edbc9b5fa2ace31bda79de8fcd41ad21bb9a0 100644 (file)
--- a/src/colour_matrix.cc
+++ b/src/colour_matrix.cc
@@ -1,25 +1,39 @@
 /*
     Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    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.
 
-    This program is distributed in the hope that it will be useful,
+    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 this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    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 color matrix for XYZ -> RGB.  This is the same as the one used by the Fraunhofer
+/* sRGB colour matrix for XYZ -> RGB.  This is the same as the one used by the Fraunhofer
    EasyDCP player, I think.
 */
 
@@ -29,14 +43,8 @@ double const dcp::colour_matrix::xyz_to_rgb[3][3] = {
        {  0.0556300804018974, -0.203976958990097, 1.05697154998779 }
 };
 
-double const dcp::colour_matrix::srgb_to_xyz[3][3] = {
+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}
 };
-
-double const dcp::colour_matrix::rec709_to_xyz[3][3] = {
-       { 0.412390799265959,  0.357584339383878, 0.180480788401834 },
-       { 0.21263900587151,   0.715168678767756, 0.0721923153607337 },
-        { 0.0193308187155918, 0.119194779794626, 0.950532152249661 }
-};