X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Frgb_xyz.h;h=3f4d790b31493c96d27fa7c4917a2685d39532aa;hb=db536bd9f9f16b79286c5f0bb54d0f283050f7dd;hp=04529db0422629163bb5195a47946c54d3da7886;hpb=41ab9a3ad26bb2fd17eca4d99780c46e315c393a;p=libdcp.git

diff --git a/src/rgb_xyz.h b/src/rgb_xyz.h
index 04529db0..3f4d790b 100644
--- a/src/rgb_xyz.h
+++ b/src/rgb_xyz.h
@@ -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 "types.h"
@@ -24,17 +38,17 @@
 
 namespace dcp {
 
-class ARGBImage;	
+class ARGBImage;
 class OpenJPEGImage;
 class Image;
 class ColourConversion;
-	
+
 extern void xyz_to_rgba (
 	boost::shared_ptr<const OpenJPEGImage>,
 	ColourConversion const & conversion,
 	uint8_t* rgba
 	);
-	
+
 extern void xyz_to_rgb (
 	boost::shared_ptr<const OpenJPEGImage>,
 	ColourConversion const & conversion,
@@ -42,8 +56,15 @@ extern void xyz_to_rgb (
 	int stride,
 	boost::optional<NoteHandler> note = boost::optional<NoteHandler> ()
 	);
-	
-extern boost::shared_ptr<OpenJPEGImage> rgb_to_xyz (uint8_t const * rgb, dcp::Size size, int stride, ColourConversion const & conversion);
+
+extern boost::shared_ptr<OpenJPEGImage> rgb_to_xyz (
+	uint8_t const * rgb,
+	dcp::Size size,
+	int stride,
+	ColourConversion const & conversion,
+	boost::optional<NoteHandler> note = boost::optional<NoteHandler> ()
+	);
+
 extern boost::shared_ptr<OpenJPEGImage> xyz_to_xyz (uint8_t const * xyz, dcp::Size size, int stride);
-	
+
 }