X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Frgb_xyz.cc;h=b4c1bd0b3f4a36935fdd79d63fd242ef33a5d0b8;hb=db536bd9f9f16b79286c5f0bb54d0f283050f7dd;hp=23c9989797e359a5086e823e7f33b90e34848db2;hpb=b53b9f3aa0603d4b4d4be23dc40ad25b4d082e20;p=libdcp.git

diff --git a/src/rgb_xyz.cc b/src/rgb_xyz.cc
index 23c99897..b4c1bd0b 100644
--- a/src/rgb_xyz.cc
+++ b/src/rgb_xyz.cc
@@ -1,20 +1,34 @@
 /*
     Copyright (C) 2013-2015 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 "rgb_xyz.h"
@@ -57,7 +71,7 @@ dcp::xyz_to_rgba (
 	uint8_t* argb
 	)
 {
-	int const max_colour = pow (2, 12) - 1;
+	int const max_colour = pow (2, 16) - 1;
 
 	struct {
 		double x, y, z;
@@ -305,9 +319,9 @@ dcp::rgb_to_xyz (
 			d.z = min (65535.0, d.z);
 
 			/* Out gamma LUT */
-			*xyz_x++ = lut_out[lrint(d.x)] * 4095;
-			*xyz_y++ = lut_out[lrint(d.y)] * 4095;
-			*xyz_z++ = lut_out[lrint(d.z)] * 4095;
+			*xyz_x++ = lrint (lut_out[lrint(d.x)] * 4095);
+			*xyz_y++ = lrint (lut_out[lrint(d.y)] * 4095);
+			*xyz_z++ = lrint (lut_out[lrint(d.z)] * 4095);
 		}
 	}