X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Frgb_xyz.h;h=60df612cf29637af26d26432bd6dc9bafadb8c89;hb=2c3f7f03e50c6bb618b3f1b321b4ed27788152f9;hp=871473c0162b53dd41a5aed7dec06e19a07cabf1;hpb=134683a552de13cd27c981bb79f30019914ff9b3;p=libdcp.git

diff --git a/src/rgb_xyz.h b/src/rgb_xyz.h
index 871473c0..60df612c 100644
--- a/src/rgb_xyz.h
+++ b/src/rgb_xyz.h
@@ -1,44 +1,70 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    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 <boost/shared_ptr.hpp>
+#include "types.h"
+#include <memory>
+#include <boost/optional.hpp>
 #include <stdint.h>
 
 namespace dcp {
 
-class ARGBFrame;	
-class XYZFrame;
-class GammaLUT;
+class OpenJPEGImage;
 class Image;
-	
-extern boost::shared_ptr<ARGBFrame> xyz_to_rgba (
-	boost::shared_ptr<const XYZFrame>, boost::shared_ptr<const GammaLUT>, boost::shared_ptr<const GammaLUT>
+class ColourConversion;
+
+extern void xyz_to_rgba (
+	std::shared_ptr<const OpenJPEGImage>,
+	ColourConversion const & conversion,
+	uint8_t* rgba,
+	int stride
 	);
 
 extern void xyz_to_rgb (
-	boost::shared_ptr<const XYZFrame>, boost::shared_ptr<const GammaLUT>, boost::shared_ptr<const GammaLUT>, uint8_t* buffer
+	std::shared_ptr<const OpenJPEGImage>,
+	ColourConversion const & conversion,
+	uint8_t* rgb,
+	int stride,
+	boost::optional<NoteHandler> note = boost::optional<NoteHandler> ()
 	);
-	
-extern boost::shared_ptr<XYZFrame> rgb_to_xyz (
-	boost::shared_ptr<const Image>, boost::shared_ptr<const GammaLUT>, boost::shared_ptr<const GammaLUT>, double const colour_matrix[3][3]
+
+extern std::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<XYZFrame> xyz_to_xyz (boost::shared_ptr<const Image>);
-	
+extern void combined_rgb_to_xyz (ColourConversion const & conversion, double* matrix);
+
 }